I noted with interest your calculations but was unable to get a physisist fro the the Uni to play with me.
I know I have sin cos the devil made me do it. You will have to recalculate on the no bounce on water though.
I was playing with an Irish man once and as we approached the ninth tee, he walked up to the lake immediately in front of the tee, took a ball out of his bag and threw it in. He said in a loud voice "and dat's for you". He walked back to the tee pulled out a driver and gave his ball an almighty whack. Well it took off like a scalded cat about 6 inches off the ground. It bounced 3 times across the lake (about 50 yds wide) and scorched up the fairway.
A true story. So factor that into the game and it could become really interesting. lol. :-)