Not really sure about your water ripples. They're too squared off - you could try using the smooth selection tool after expanding it when making the ripples.