I've used neither of those, but if you want a slight marshally quality that has more grind than crunch but can be set to sound incredibly transparent try a zvex box of rock or distortron. It is a discreet circuit using onlyMOSFETS to amplify and clip your signal, no ICs.
The old Colorsound overdrive is an all discreet transistor circuit that is more of a fuzz, but because of the implementation of the volume and tone controls it behaves like an OD until you gun it. Into a clean amp it can sound a little transistory and masty (in a good way to my ear), but adding its own drive to an amp that's just getting a little hair it will blow (by blow) you away (get the Jeff Beck reference? he favored this particular pedal). I think the best current production version is the Throbak Overdrive/boost though DividedBy13's Joyride is also pretty good.. I have an old one and a copy with a master volume control that a friend built me (I was too busy touring at the time to build my own).
None of the pedals I am about to mention are discreet circuits, but in an overdrive discreet componenents really don't make much of a difference as long as a good IC is selected. We are not talking about a high bandwidth microphone preamp here, the goal is specifically to limit your bandwidth and destroy your slew rate to the point of distortion. Whatever gets the job done will get the job done.
I am quite partial to the EHX soul food as it sounds A LOT like whatever amp I put it through other than a slight bass drop-off just like an original KLON. JHS mods them and one of the things they do (other than adding the KLON secret-sauce germanium clipping diodes) takes care of the low end response. I am too lazy to bother messing with mine. If you want a less compressed tubescreamer with great tone controls try the Timmy or Tim pedals. A lot of people really swear by the mad professor sweet honey overdrive and very similar BJFE/barefoot honeybee but when I tried the SHO I was kinda left flat by it. Try one for yourself though. All of the Catalinbread overdrives are great, both the older models like the SCOD and the newer foundation pedals that are an amp -in-a-box. Can't go wrng with a Way Huge Red Llama either. SImialr topology to the CB SCOD I just mentioned as well as CB's discontinued Hyperpak overdrive (which is killer if a little noisey). All of the CB foundation drives are discreet circuits utilizing different configurations of jFETs and MOSFETS if you really care that much.
That said, the best overdrive ever is an amp that's the right size for your gig cranked up through a quality speaker. I would recommend that if your amp is just a little too loud that you spend money on a well-voiced low-efficiency speaker like Weber's Derek Trucks models. Then go to 11!