I like your suggestions. I'm kind of a wimp when it comes to stims so my preworkout of choice is typically Optimum Nutrition Amino Energy or Allmax A:Cuts, however for a strong pre-workout you can't go wrong with Condemned Labz Convict or APS Mesomorph.