The couple things I would say are - you are only on less than a week -- give it 1-2 weeks to "see" any results. As far as bloating from the broccoli, I cannot say how much "Beano" and Digestive Enzymes have been a godsend for me. I bloat immediately on broccoli - -I've been takign 2 Digestive Enzymes (you can get at GNC or just about any health food place) with each protein + veggies meal.
The water retention still could be related to anythign because it doesnt' sound like its been going on a long time and just happened to coincide w/ starting the var. If it continues for several days after you've done the carb rotation and dealt w/ the broccoli bloat, then we can consider it more closely. When you are dieting clean it seems like just about anything can set off a stomach ache or water retention, so its hard to pinpoint and say its a problem unless it is persistant.