Leave the $80k loan the way it is, but put an offset account against it. Dump all your surplus cash into that offset account.
By doing this, you'll reduce the non-deductable interest, but in the event property B becomes an IP again in the future, you'll retain the loan at its maximum for...