rdavidson: did you have a spring loaded bottling stick? or just a tube? It only leaks if you leave it pushed on for too long, not sure how you were getting leakage/waste there.
On cleaning bottles: I stopped quite a few steps a while ago... These days I rinse the bottles out with hot tap water when they're finished, and then on brewing day, I just rinse them all with hot tap water again. A little hot water, hand on the top and shake, tip out, repeat, then run a bit of water over the neck. (That's right! no jodofor, no klor, no nuthin) I use a spring loaded bottling stick (
http://www.hopshopuk.com/products/view/ ... ling-stick) on a siphon tube, and just fill them til they're _just_ about to overflow. Removing the stick leaves the "right" amount of headspace.
I put the caps in a big bowl, and boil the kettle, and pour the kettle over all the caps. The caps get places on each bottle, and the bottles are lined up in rows so that the handles on the "little red capper" don't get in the way, and so that I don't have to move everything around all the time. Then it's just cap, cap, cap, cap, label the caps/bottles, and call it a day.
if I _was_ going to use something more sterile, I'd probably just use a (small) bucket of joðofor, and quickly rinse each bottle in it. I don't see any reason to use klor/bleach on your bottles, unless you didn't clean them when you got them. (joðofor won't clean hard dry crusty beer dregs out, that's a job for when you emptied the beer!)
(If you have a dishwasher, it's also totally legitimate to put them all upside down in the dishwasher, and run the drying cycle. It's hot enough to pasteurize, which is all you're trying to do anyway)