Exactly how much is "too much"?
Also, how soon before training is your last meal? The combo of "too much" food (and/or food that's too heavy) plus "too much" water could be what's causing you problems.
For the last few months, I've been using the Anaconda Protocol 2 (Anaconda, Surge Workout Fuel, and MAG-10) mixed with about a half-gallon of water.
Some people find it easier to take a few weeks to gradually work up to increasing the fluids taken during training.
In any case, you almost always want to be drinking something other than plain water during your workouts.