Just thought I would update people as to what I ended up doing.
I still have JJ's in the power section but replaced all the pre-amp tubes with Electro Harmonix 12AX7 EH. What a difference, the head room is incredible. I have not played a gig in the 36w mode since. We play reasonably loud and my volume settings are pre=6, master=3-4. People don't believe me when I tell them I'm playing an 18w amp.
I run through a TS9 tubescreamer for that full overdrive sound and a DS1 for leads. Everything else is straight through the amp and the sound is awesome, just that nice amount of breakup - I'm not a real clean player. My cab is a 4x12 with Lorantz 50w greenback clones (check em out). Guitar is LP with SD pickups.
The only other mod I have done to this amp is move the on board slo blo fuse to the outside near the main fuse. It blew on me one night and had to feed in through the PA. This makes it easy t o replace if it ever decides to go again.
Great amp Nik, thanks.