Tony,
After seeing enough of your posts and a few videos, I think I have a pretty good handle on your tastes when it comes to tone.
If you like the M-series preamp but want more cut and gank from it, I would offer up a couple of mods to get you there.
First, replace the stock pickups with L-series humbuckers. I feel the L-series pickups in SCM is a full enough tone without needing to go into either series or parallel, so I would wire them to a 2-way switch that selects either inner or outer coils. To me, outers would get you into a sort of '70s fender type sound, while inners would be similar to the "avanti" spacing of your signature. Second, I'd add a series/parallel switch that uses both pickups. you switch it to inner coils and flip it into series and you have something pretty close to "your" sound.