Cobra, sounds like you are now fixing something that wasn't broke.
Every person i know that went T trim or larger on a stock block, wasted their engine in no time.
IMO, resell the ys, buy a heavy duty S, then when it's time upgrade it to a T.
We both know mid 10's is great on the stock block, not sure how much better it's gonna get.