I have decided to go with the second option for the water.
And have completed mountain placement on the isles of Takeshidai. I am pretty happy with the result at the moment. Mountains were done using rendered clouds, copy/pasting segments and then smearing to generate a smoothly blended look.
I am about to begin work on the hills and plains, which will all be done 100% manually.