Andrew I will flag a few things:
* the equity that you intend to redraw from your current ip may not be able to be claimed as a deduction (unless it's in the offset account).
* budgeting with a 2% buffer is a great method provided that you put the additional amount into your offset account...