New phone after Nexus 6P

I'm currently on a contract and looking to switch to sim only deal and buy a phone outright. I'm in the uk and preferably would like to spend less than £400. All i'm really after is something that matches the performance of the 6P. Only reason i'm getting rid of that is the battery is terrible now. Thanks in advance.