Help me choose a new laptop.

Hi guys. I'm in the market for a new laptop and would like your help. Right now, I'm using a Mid 2012 13" MacBook Pro with the 2.9 i7, 16 GB of RAM and a 525 GB SSD. 100 GB are reserved for a Windows 10 partition. Performance-wise, the computer is excellent, though battery life isn't that good. I'm searching for a better screen, better battery life and a lighter package. I love my computer, but carrying it around isn't fun at all. The new Pros seem awesome, but the price is ridiculous. What would you recommend? Keep in mind that I paid $1300 for the machine and $300 for the SSD + RAM. This means my budget is around $1500.

It's very important for me to stay within MacOS, as I have an multiple files and devices synced with my iCloud.