I ended up replacing both the J and the MM with the Haussels, but left the pre amp as is. For sure it contributed to the sound mellowing out, and I am sufficiently satisfied (for now!) not to make anymore changes.
I actually picked up a JMJ Mustang as well and I would say the TM4 is a nice...