JJJ ... looks like your ready for the long haul!
I have a little tool kit I use for maintaining my fishing reels, and most of what's in there applies to guitar hardware also. It has mini screwdrivers & pliers, and I also keep a peg winder, chamois, extra strings and daily stuff nearby. Also have a truss rod wrench nearby, just in case. A really good lubricant for the tuning heads is Quantum Hot Sauce. It's made for fishing reels, but it also has a sticky additive to keep it from dripping. And last year, I gave my Les Paul (black) a layer of Nu-Finish polymer car polish on the advice of a guy at a Halifax guitar shop ... and oooo-wheee does it shine! The water beads off it in the rain just like the TV commercial depicts (kidding!!!).