My cat is driving me nuts...

[mm15]

so i adopted this cat about 3 months ago...it took him about 2 weeks to get comfortable at my house...and he has turned out to be an awesome guy....when i picked him up the old owner said he was fixed and was telling me his likes and dislikes...she made it very clear that he likes his food on the floor but he likes his water up by the sink...well since i dont want him walking and jumping around on my kitchen counter i decided to set his water on my vanity in my bedroom right next to the sink...this has worked out fine...he drinks and never has a problem. About 3 almost 4 weeks ago he started knocking the water off the counter to the floor...soaking my carpet, his food and anything else in the way. I have no idea why he is doing this. NOTHING deters him....yet at the same time he doesnt do it every day/night.....the only thing that is consistant is that he only does it when im in bed and have to get up early....my bf jokes that he is doing it so i get out of bed to play with him. I have gotten so frustrated with him that i have swated him on his butt, it doesnt help...he keeps being a jerk. There were a few times i put the water on the floor...thinking maybe he doesnt want it up high anymore...but then it seems like he isnt drinking....or at least not as much as he usually does. I dont know what to do, i want him to be happy but he is driving me nuts constantly having to get up clean my carpet for all that water and pick up all this soggy food....not to mention how much food he is wasting.