Stockport
Four track the whole of the castlefield area, fix Oxford Road, build platforms 15&16 (and possibly 17&18 while you're at it), then fix the flat crossing by the junction down to the airport.
It might even be worth it to look at the local stations on the way out to Stockport and see if the junction between fast/slow lines can be moved to after Stockport, pairing by use rather than direction for that whole run - would certainly reduce the number of conflicts arrive Piccadilly.
Four track the whole of the castlefield area, fix Oxford Road, build platforms 15&16 (and possibly 17&18 while you're at it), then fix the flat crossing by the junction down to the airport.
It might even be worth it to look at the local stations on the way out to Stockport and see if the junction between fast/slow lines can be moved to after Stockport, pairing by use rather than direction for that whole run - would certainly reduce the number of conflicts arrive Piccadilly.