Stock up more on the calibers for the guns you consider to be your combat guns. If it's not a combat gun, then you don't need to stock enough ammo for it for the end of the world, just enough ammo to go to the range and enjoy shooting it.
Also, the amount of high quality ammo that you stock for combat guns depends on what kind of gun it is. In my opinion it would look something like this:
Carbine ammo, 5.56, 1000 rounds
Hunting ammo, 12 gauge and 22LR, 200 and 1000 rounds, respectively
Handgun ammo, 9mm, 300 rounds
Precision gun ammo, .308, 100 rounds
Setting realistic goals for the amount of self defense ammo to have on hand will help you get there easier. You probably wont shoot 10,000 rounds of 5.56 unless we're having a civil war and you're in an organized force that's being actively supplied, so there's probably not a need to have 10,000 rounds of TAP 5.56 when that money could be spent on 50,000 rounds of WOLF to practice with instead.
Beyond that, stock as much cheap plinking and practice ammo as you can afford. It isn't getting any cheaper.