Yes, sorry to say your assumptions and your calculations are correct.
One thing is though, if you keep the property the rent will help you pay down your PPOR loan faster.
If you decide to sell then buy again you also need to consider CGT plus ingoing and outgoing costs. That will add up...