I would substitute green tea for the diet coke - I just started taking it pre-workout a few months ago and am hooked. Tastes good, is healthy, increases metabolic rate, and gives you that caffeine lift.
I separate my cardio and strength training. Usually do cardio in the morning and weights in the evening. Hard to give maximum effort when lifting after running 3 miles (and vice versa).