I think the terrain you're using now gives the water a much better sense of flow and direction. I wonder if doing gaussian edges might smooth down the outside ridges while keeping some better height in around the pillar. I'd say you're definately moving in the right direction.