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