Congrats Renfro and welcome! That wait is a hard one for sure! I think you've got the right ideas!

I would also suggest grabbing some glass in advance for your heat bed. Grab some cork tiles or sheeting as a under heat bed insulator. FILAMENT! Small zipties. 3 in 1 machine oil for the threaded rods. Digital calipers, the cheap amazon ones are just fine. Hairspray if you're going with the glass and hairspray method. A good set of metric allen wrenches.

Also, make a thingiverse profile and start snatching up a bunch of makerfarm printer improvements/yoda heads you want to print!