Hi I'm reading your post and you stated that the Air is very capable. I do the same work as you photo and video editing and my dilemma is the day, non retina screen on airs.That's not great advice.
The new MBP is a stunning machine. My 13" and 15" touchbar units are the best laptops I've ever used. They will not compare and the Air will seem inferior.
In the beginning that is!
But the butterfly keyboard is not a small problem. As I posted in the MBP forum, my friend ordered a LOT of the new machines for the Board of Ed in NY. A third have keyboard failures after just 4 months.
Look, the keyboard failures are a lot like global warming. It's no fun believing in it...until a big storm washes your whole state away. I was one of the folks who ignored peoples warnings about the keyboards. I actually went back to that forum and apologized to those folks! Don't make the same mistake I made. Wait until Apple resolves the keyboard issue. If you MUST have a new laptop, get the Air. You can always sell for good money and upgrade later.
My i7 based Air is VERY capable. I even completed a photo editing job on it!
R
It drives me nut when I'm editing in photoshop and I really feel like I color edit wrong. Airs for photo editing are ONLY good if connect it to a Retina display but what about on the go editing when u are only using your screen????