Here is a very rough idea of what I'd like to do eventually. I probably should have built it like this in the first place:
This idea would keep as much of the current layout intact. I would convert the front isthmus into a peninsula and would lose the duckunders. The staging yard would be in the workshop and I could probably add a couple long passing sidings too.