Yeah. The only fix I can think of is getting rid of the water. It might make the level look a bit bland, though. :/
I've had a quick scan of the ROM, and the game seems to modify the following levels in some way. Hard to say what the changes are exactly until I investigate further. There may be one or two false alarms, and some levels could be missing, just to wind you (and me) up.
Fun 9, 15, 17, 20, 21, 26
Tricky 4, 7, 21, 25, 26, 28
Taxing 1, 2, 6, 7, 11, 12, 13, 21, 24, 29
Mayhem 3, 9, 12, 13, 18, 23, 26, 28
[Edit: Removed Mayhem 27.]
[Edit 2: Added Fun 9 and Tricky 26]