I had the Martin Kidd modded JCA Custom 22. It was insane with gain. Doug actually upgraded the caps, and all sorts of other upgraded components before he shipped it. For no reason, other than being the nice guy Doug is.. Sounded pretty good, was plenty loud too. Screaming lead tones. But, it succumbed to the EL84 OCD I have.
Have you considered the SC20H? I know I made the Mini Jube suggestion that I thought would work well for you, (that didn't). Maybe you need those bigger bottles, yet portable. Sell the Runt, throw in some cash, and maybe a 3534, or the Carvin Legacy III would do it.
Or, get a cheap, used Jet City, and send it to one of our resident experts and upgrade and mod the shit out of it. They DO have potential, but you're still stuck with EL84's.