Hi there
One other thing that you will need to consider in your calculations if you aren't already is the future affect of CGT should you choose to sell either of your properties.
For your existing PPOR that is now an IP you could ultimately choose to claim the six-year CGT exemption...