I would stick with the non-stop. IAH is not my favorite place either, but the lounge is not bad, there are shower facilities, and if you really have no work to do you can load up your iPad with movies and veg out in the TV room, perhaps pulling a couple chairs together and taking a snooze.

I hate connecting if it can be avoided (now that MR is about dead).