Finance guru's will be along shortly but I would say you had it set up correctly with any excess funds in the offset for the PPOR thus reducing interest on non-deductible debt (PPOR). Transactions in and out of the offset do not introduce any tax implications as your not transacting in the loan...
