Mate, you're in Perth, you're the one with the weird times. Made the diagrams last night, fell asleep, posted this morning.
Pest, there are much better ways to do them, but I've just been using GIMP (cross platform, free, and I'm used to it). I use separate layers for each component type (pups, caps, pots etc), and separate layers for each wire colour. I take photos of my components as I use them to build up a library and then just paste them in as needed. For example, in the above diagrams I made the first one then just changed the pot layer and some of the wire layers to make the second diagram. The hard part is figuring out the design in the first place... option 1 of the Frakenpester took some head-scratching. Paper, pencil and eraser are still your friends when working up designs.