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
_________________________
Live: Korg PA4X/Bose L1 Pro 8/Senn 935

Studio: Korg PA4X/Kawai MP7SE/Tascam DP24SD/Sony C80/AGK 214/ATEM Mini Pro switcher/