I think that is a great idea. Buy the TYC replacements for the glass only, and swap them over to Toyota housings, along with the TRS stage 3 kit.

I do plan on pulling mine apart soon and shimming them to better align them to the housing.