Best compromise for Blackface cleans and Marsahll OD tones

About a year ago I built Blackface clone...based on a Princeton, but with TMB controls, bright switch, 3-setting negative feedback switch and a Deluxe Reverb OT.  I put a WGS G12C/S in the combo and love it for clean tones, but am less enthusiastic about the tone with my Marshallesque OD pedals.  

A few years ago I built an amp based on a JCM800 with a single ended EL34 output stage, and run this through a 1x12 cab with a Green Beret, which I absolutely love.  I also have a Marshall JVM that I run through actual greenbacks.  So that's my reference for OD tones.

Is there a WGS speaker that will give me better OD tones, but still do justice to the Blackface cleans?

The thing that brought this home was recently getting the JHS Andy Timmons pedal.  Running it through my blackface clone, the tones were nowhere near what I was hearing from demos by Andy and Pete Thorn.  I didn't expect them to be identical, but thought they should be closer at least.  When running through the Green Beret cab, it was way better, but while the cleans are still nice, it would be nice to keep the cleans a little closer to traditional blackface.

Thanks!