Congratulations on your admits! Great job!
Both McCombs and Madison are regional schools and both will place heavily within their regions (Texas and Midwest). However, McCombs being a top 20 school in the south has a much stronger name as a BSchool. However, both schools have a stronger undergrad than business name.
Texas actually offers quite a few tech options for employment as well. CPG, not sure but you seem to have covered that area already. If Madison looks like a viable option, and offers good placement within your companies of interest, then definitely pursue it. There is nothing better than graduating with a free MBA and not being burdened with a $1.2K/month loan payment.
While it is not common, many also recommend approaching your school of choice (Should McCombs be it) about getting a bit more $$. It sometimes happens but schools rarely match other scholarships.
Not sure about lack of diversity with going to the same bschool as your undergrad - I don't see a whole lot of issues with that.
P.S. I added a poll to your post.
Rankings Source:
all-2015-mba-rankings-99812.html#p770991
Attachments
McCombs vs Madison.png [ 378.79 KiB | Viewed 1278 times ]