Have you toured both TAMU and UTD? Their campus cultures are as different as day and night! Both have solid CS programs and both will give you merit money but UTD will likely give you more. You might take a look at UT San Antonio if you feel you need another safety.
Just fyi, my high stats DS (top 1%, 1590 SAT) opted for UTD over UT for thier CS program. Not only did they give him amazing merit money but their program offered more options for undergrads in CS. He also felt that UTD offered a more collaborative environment instead of a more competitive environment. He is in UTD’s honor program and their CS2 comp sci honors program and participated in their Clark summer research program. UTD was also just named an official tier one research university opening the way for tons of extra state funding.