I went for the 24641.
In my opinion the extra compartment for the laptop uses up space unnecessarily. I usually just have my laptop in a sleeve. For instances when I don't get my PreCheck, it takes just a few seconds to slide my laptop out of the sleeve and into the bin.
I'll second Mellonc's advice against leather. Tumi's ballistic nylon is great.
If you don't want to screw it up, why not drop by a Tumi store and check out both in person? That's what I do.