I guess we'll see what Flemming has to say after he's had time to digest all this.
Going from O36 curves to O48 curves will mean most track has to be moved, so rewiring is not a bad thing. I just don't want him to spend a lot of time/money on connectors, etc., if a complete rewire is not going to fix the stall issue anyway. From what I can tell, except for the stall, the layout works the way it's wired now, so why not take the easy route and just move things around a bit?