Right after a stim pre workout I would recommend a stim break for 2-4 weeks. Something like hemavol + stim free focus xt would work.
Then you could try purus labs condense (I really enjoyed it), MM might be a little strong especially if you're prone to crashes. PNI Prodigy had some great reviews and a promising formula. Or you really could use C4, I have always enjoyed C4 and its the only pre my wife will use.