I use Just Radios for Tubular Caps. They have the "Prewar" Cap values, i.e., .05 rather than .047, etc. Their prices are good.
I use Mouser for Electrolytics. They are fast shippers, good pricing, wide selection. They have radials as well as axial leads, and 105 C rated and long-life caps.
Buy your stocking order of Tubulars from Just Radios, and your project specific Electrolytics from Mouser.