Rory Gallagher was known mainly for using an AC30 with treble booster earlier in his career (which is how Brian May started using AC30s with a treble booster), and a Tweed Bassman later in his career.
The JTM45 started life as a Tweed Bassman clone, and even used US-made 5881s. Marshall quickly changed to UK-made KT66s.
Virtually all the original JTM45s I've seen have had KT66s installed. Even the few I've seen with EL34s probably where originally shipped with KT66s as judged by the transformer codes.
Around 67/68 when Marshall changed their output transformers to accommodate EL34s (KT66s were run with much higher loading that the later 50W amps which used EL34s), and it's unlikely that many JTM45s were shipped with EL34s, if at all.
So if you do want to get a JTM45 style amp, then, in my view, you should get one that uses eithe 5881/6L6s, or (better in my opinion) KT66s. A JTM45 with EL34s will sound very similar to your 50W Plexi.
There are plenty of companies making JTM45 "clones" that use these valves.
The 5E3 Deluxe is a great amp, and again there are plenty of builders making either clones, or hot rodded versions of this amp (I can think of 5 off the top of my head in UK alone).
To get the best clean sounds out of a 5E3, especially with a humbucker loaded guitar (remember these were built to match Fender guitars), you will need to experiment with rolling the guitar volume down, and turning up the channel you aren't using!
However, both these amps will be very loud for bedroom use.
If you are after a Fender-style amp, it might be worth you looking at the Cornell Romany which has integral power switching (and no I don't work for Cornell!).