Here is a later plan that Roger Lloyd has worked on.
It meets some of Mark's goals, it has all his stations, with only one needing modification. The pier gets better space. Roger has adopted the partial mushroom idea (following Mark's interest in these concept).
There is a double ended though style staging yard.