Galaxy S5 Camera Will not focus

[VettleBolt]

I've had my Galaxy around 12 months now, ( i have 2, one Personal, and one for work) and Recently my Personal one's screen fell off [not that i care since i have 2 ] (Has own Post http://linustechtips.com/main/topic/363790-screen-fell-off-galaxy-s5/)

 

But now with my work one, the camera will not focus, it attempts to but won't unless the object is very close up, I rely on the camera because i need it to take photos for diagnostic and insurance reasons because of my job. (Won't go into Detail)

 

I'm due for a new phone now anyway, The plan i have with my carrier, allows me to get a new phone every 12 months(meaning i can have the latest phone) without starting a new plan, all i have to do is return the previous one ( In working condition) 

 

I am going to go back to Sony's Xperia since i really disliked Touchwiz,(this was my First Galaxy) and i require a Waterproof phone (Galaxy S6 is out of the question) since i work with Boats and i'm around water, a lot and i really liked the Xperia Z when i had it

 

Should i wait for the Xperia Z4 or get the Z3 now