I have not done a very good job at keeping up the last few days, so not much to say really. Definitely use my Tangled ride if you want, but that's a little funny to me since it was a attempt at retrofitting a ride into the tiny and weird shaped Peter Pan's Flight.
I did see discussion on the overall park layout and suggestions to do a ring park around a lake. Personally, not a fan of that form because of some awkward planning results from the central focus. You either end up with lands that are active along the lake but have really a single face pointing inwards, like EPCOT, or lands that are more dimensional but have dead space along the lake, like Islands of Adventure.
EPCOT's not bad, because the concept of pavilions allows the lands to be a little one dimensional, but it could be an awkward look for more fleshed out areas to all be facing each other like that. They remind me of stage sets, 3 sided and always pointing back out to the center and the rest of the lands. And at Islands, pretty much each land has a weird leftover plaza by the lake that is void of activity, all because of the dilemma of not wanting to block out the access and view to the lake, but also wanting the lands to be pulled away from the lake. Good ideas, but it ends up being a waste of space that really should be a ride or service or something that would inevitably block the central lake.
I like the castle by the lake idea though, so I would suggest a modified Hub and Spoke (maybe call it a Ring and Spoke?) like Shanghai. Traditional entry spoke to lead into the enlarged hub, which could hold your lake, and then standard branches off into the lands, which themselves could form an outer ring to the central Hub/lake land.