Recommend me a new phone

OK so my phone contract is up in a month and it will be time for a new handset.  Hoping the community can recommend a phone for me based on what i want in a handset.

MUST HAVES:

Good camera

either 64gb onboard OR SD card support with 64gb

 

WOULD LIKE:

Good antenna - lots of regional travel

RAW file support for camera

solid build quality or really good case availability (like otter box)

 

Current phone is a Sony Xperia Z which has been ok, but camera is lacking, sd card slot is broken, drops calls a lot, battery is shit.

Also - I could wait till feb if the next gen phones will be drastically better than whats out now.

No brand allegiance so any suggestions are fine.

Would prefer not to get an iPhone - but if its the best tool for the job then that's ok

 

Cheers!

OnePlus One might be an option. Logan did a review on it. There is also the Nexus 6 and Moto X (2nd gen), except I don't know if they have Raw support. There are a couple of Nokia phones that have good cameras in them, but run Windows Phone.