Personally I'd go the other way. I'd rather have a barebones, newer, smaller capacity model with autopilot than a loaded non-AP model. Autopilot is a game changer on those long highway trips, as in my experience you end up less tired at the end, and I don't mind stopping for supercharging and a leg stretch on occasion.
Tonight there's a loaner non-AP P85 in my driveway while my AP 85D gets her annual physical. Just in the day or so of commuting I've really missed the Autopilot, and traffic has been more stressful. First world problems, I know-- the P85 is still a sweet ride.