Unless you're playing live with a drummer I think 40 watts would be a waste of money. My little 18 watt amp is too loud for living room use if you want natural distortion. My brother has one of my 18 watters and a VOX AC15 and he found both to be too loud once you get to the sweet spot. He just bought a new Fender 12 watt tweed amp and is very happy with it. I think it's the Eric Clapton Tremolux model. It sounds great but costs a fortune, so it would never be on my hit list.
The pentode/triode settings are basically circuits that hobble the output tubes. I did one of my usual amps with this added and there was very little difference and I didn't like the mushiness it caused. The little 6V6 Marshall sounds real good and you may be able to install tube adapters like yellow jackets. This gives you 2 output tube families to work with. As for the aversion to the vintage 30, I can only tell you that speakers are cheap. Pull the stock speaker out and replace it. You will get the most tone change for the least cost by changing speakers.
I'm working with an online tube vendor to start publishing practical info video's for guitar players and tweakers. I will soon be publishing some video about pre amp tube substitution. You can see in the video how much gain reduction you will get by using each of the common 9 pin pre amp tubes.
Small amps rule when space is limited and tone is important.