Note: @Easte said I should rewrite my old thread (somewhat hurtful...), so here it is.
One, lets change bottlebending. I say you can only do moves if you had X amount of bottles. (To tie into my second suggestion, you cannot use bottles to make water surround you.)
Two, watermanipulation...