Welcome back! Hope you stick around!
Or rather, draw down equity to buy your PPOR closer to the city and use the ~$500 you were expecting to pay for rent, towards the mortgage? Not knowing your financial figures, I wouldn't be able to guess whether you'd hit anywhere close to your 'ideal'...