Outacontrol talked me through it - I misread on the switch which was the common terminal.
Anyhow thanks all. (And outacontrol! Appreciate it!).
The problem is I couldn't do the lighting in the way that second diagram shows, well, I could have, but I would have ended up using WAY more wire and I'm down to the last scraps of the spools I bought and still have to install a light above the tank room sink and then one more circuit for the wet bar. Thought "It would be nice to be able to put a kettle on" there, so looked up the typical watts rating for an average kettle and nearly fell off my chair .. so, um .. yeah, gonna leave that one on its own breaker and call it done.
Nice thing is once I've got the inspector come through I can start updating the tank build thread again with actual tank build updates and not "I hate that my basement isn't finished" type stuff.
