I like that you are saving hard, and thinking ahead - esp regarding converting a PPOR into an IP. The offset account is perfect for this.
Just be careful, though, about the 6 year rule. Doesn't it only apply if you don't get another PPOR in the meantime?
Best of luck - you're on your way.