Home Interest Deduction: Multiple 1098s, Box 2 Outstanding Balance still aggregating every loan in that year.

I see that a new update came out today to address this, but all they did was update the instructions, not fix one of the problems. I have 5 1098s. My loan coming into the year, my HELOC, my first refi, my first refi which was transferred to another lender, my 2nd refi. The only way the numbers work correctly for me is to aggregate all loans except the HELOC. My main problem is that the box 2 numbers aggregate and that screws up both my Federal return numbers and my California return numbers, making the total debt on my house over twice as much as it really is.

 

Since this problem has been reported for years do we really think it will be addressed by TT this year?

 

Please help if you have any solutions. As I said the only one where the numbers are correct is just aggregating them all into one loan (except the HELOC).