Yeah, I’m busting the ECA on my workout days too, I switch off to a yohimbe/caffeine when I wanna lay off teh ephedrine.
But yeah, maybe try some powerdrive pre-workout without caffeine and see how that treats you. Powerdrive is some good stuff, no caffeine or anything either, just tyrosine, phosphodisterine or somethine, and DMAE or whatever. But I’ve noticed its an instant mental boost!