That's probably about as good as it gets with online calculators, which is why they're generally worthless.
Also the equity in your PPOR doesn't really add to your serviceability, it adds to your potential security.
Brokers pay a lot of money (either directly or through other fees) for...