Maybe you have already found your amp.
A simple amp that sounds great is the Fender Pro Jr w EL-84s.
Nice cleans, but wonderful bluesy OD when turned up. Even classic rock.
Can be improved with a Weber Blue Pup speaker and JJ tubes.
With the substitutions, the harmonics come thru...