same stuff since '95
Do not buy anything yet, because you have insufficient experience at this point to decide what might be best for you.
I mean, you already bought 'some stuff to get you over'.
Unless, of course, money is no object, you'll find your gear needs and desires change as you gain experience, and your goals get more sophisticated.
So I suggest at this time sticking with what you have, and borrowing some of the gear you have interest in, to see if it's actually worth it.
"all my ammo is mostly retired factory ammo"