Looking to upgrade laptop, suggestions needed.

I need to upgrade my laptop, I primarily use it for developing my side projects and the like, along with some light browsing and some YouTube, Netflix, etc. on the side. But primarily I need something that's very portable, has a great screen, and is powerful.

I've been waiting to see what Apple has in store with the new rumored Macbooks but they are dragging their feet and I'm being impatient.

I've heard good things about the Dell XPS 13 and Lenovo Yoga.

Any recommendations?

EDIT: The main things I'm looking for is a great screen, which is why I'm still debating on waiting for the new retina MBPs, but also something thin and light, with good configuration options when it comes to SSD and RAM.