That looks way better! If you are not already, consider having seperate layers for your water and background tiles, it makes the transitions alot easier. After many iterations I went with with the most simple solution for my system, each tile has several weighted variations but only 4 edges