As for stims without caffeine I would suggest NPs house geranium product...honestly though, it's dosed very very strong and last for hours. I would take it with the tea or coffee that you mentioned above.
DCP seems to be pretty popular too and should aid in fat loss while helping with a little energy (not a stim in any sense though).
You might want to invest in some Benadryl (generic works just fine) to help your receptors recover from the ECA. Another route would be Reset AD, but it costs a lot more.