Hi Mick
Just a suggestion..
Consider open a second offset account (but with no access card)
Change from P&I to IO.
Then pay what you used to pay for the principal component into the second offset.
Just like P&I but you can use the principal for your next PPOR without having to redraw...