You've answered your own questions, it seems. I'd say keep the T2 and add the PA800 (a board I have and absolutely love) and you'll have the best of two worlds
_________________________
Yamaha 920 / Yamaha DGX-670 / Maui 5 Go (2) / Senn e935 / Sony C80 / Tascam DP24sd / ATEM Mini Pro switcher (studio)