I honestly have been waiting with my wallet ready for a year to replace my 2013 macbook air but thus far Apple hasn't released anything compelling enough for me to want to switch because I love my 2013 air but I wish it had a better screen (not even higher resolution just better colours and IPS with a thinner bezel) and also I would love even longer battery life. The macbook doesn't do it for me, battery life is worse than the air and only one port. Macbook pro doesn't do it for me either, thicker, heavier, more power than I need, and worse battery life. Many times I have considered switching back to windows but unfortunately I am very wary because every windows laptop I have used in the past has had a really bad touchpad
Every sentence you said is my exact thoughts. My 2013 macbook air was the best computer I've ever had bar none, but I do photo editing work a lot, and watched a lot of movies from bed with it. The lack of an IPS screen, and the fact that I only had a 128gb SSD in it made it time for an upgrade, so I sold it a couple weeks ago for $750 on craigslist in anticipation for the new mac announcements.
I've never cared for the Macbook Pro line, still too bulky IMO, and I really like the tapered shape of the air, and the Macbook isn't option due to major speed downgrade, more expensive, and awful keyboard. We need a new true Air upgrade.