Do you by any chance know websites where you can order?
I buy most of my stock from Mouser.com. I like the search and order pages better and they ship in ziplock bags.
Just make sure to check "IN STOCK" when you search.
You can also set "audio grade" for smaller caps (right side in electrolytic cap) and just buy Nichicon or Elna (pretty much all you'll get).
Trying to match lead spacing is not something I do. Many factory caps do not align in the holes and its not like this stuff is going into space or nothing violent.
Digikey.com is our other favorite place. Some people like them better.
Both places have no minimum but the lowest postage on Mouser is like $7-$8 so the more you buy, the better.
Digikey has a tiny first class thing for a couple bucks but its for like one or three things.
Mouser ships SO FAST that if you make a mistake and call them right away...its too late.
Most of my orders come UPS (I select USPS but I think they have a deal with UPS).
Sometimes UPS hauls ass and I get my order quick (3 days to me from TX). There have been a few time that took forever (like over 7 days).
Digikey is just about as fast.
Both have excellent customer service that will hold your hand if needed.
I worked with both on some whacky special stuff and it wasn't much of an order but they helped like I was their best customer.