I would be looking to do the IO thing NOW, or yesterday actually, since the more remnant debt you have the better for your quite highish marginal tax rates.
As an aside, further streamlining could involve looking at a part spousal transfer while still PPOR, to allow for some partial regearing...