+1 for the "1:30 is too short" camp.

If going up to SFO is not a problem for you, I would call UA and have them change you to a 9-ish flight from there. Since it's a sked change, it's on them to accommodate you, from an alternative point if they must.

Otherwise, take the 6.30 and make yourself comfortable in the lounge.