Well, it really comes down to land vs water and by the looks of it you prefer land. DWVs are a must-try as far as OWVs go due to their privacy, condition, view (especially 348) etc, so maybe if you did still want to consider OWV you could split the stay between the two and maybe go (1/3) water --> (2/3) land, rather than land --> water. I suppose there's another factor and that is how keen you are on the new decoration.