Mm.. Maybe a Note 2? If not, go for an N900. I really would like to try one out. If the problem only happened a little later you would've replaced it with a Jolla phone. Just get a list of the top phones and get the one you like.. I would either go with another N9 or an N900 if it was now.