I think we'd all recommend Surge to you. If for some reason you don't go w/ Surge, get a 2-1 ratio (this can be changed a little to meet your goals) of carbs to protein and rapidly digested carbs (maltodextrin/glucose) and rapidly digested protein, (hydrosylate).
I've heard of people, (and had clients) that don't seem to respond well to the pre-workout shake (upset stomach) so I have them consume it when finishing w/ the workout. Give PRE a try again and hopefully you'll be ok. If not, do I'd suggest you @ least drink it post.