Pre-Workout/Post-Workout Mix

I am about to start taking a custom made drink before and after my workouts. I will include:

  • Creatine Ehtyl Ester (3g before and 3g after)
  • Beta-alanine (3g before and 3g after)
  • Citrulline Malate (3g before)
  • BCAA (10g before 10g during 10g after)
  • A little bit of Crystal Light for flavor

I am trying to figure out what would be good for an energy booster to go along with this mix.

I would like to hear your feedback and tell me if you think I am missing anything, making a mistake, etc. Any and all feedback is appreciated.