Aren't there only 2 wishes for shenron instead of 3? I know Kai messed that up with the buu sub.

I don't know what Light's wish would be. Probably the average power boost sorta thing or something. She views the dragon balls as a bonus, she is just there for fun. 

And yeah, the Guls fight will be interesting.