Here is a plan that Roger Lloyd has worked on.
It meets some of Mark's goals, it has all his stations, with only one needing modification. Hazeldale Loop has dissapeared. The pier gets better space.
There is a double ended though style staging yard. There is a small branch above Greytown, making Ninamanina a junction.
