Wait it out a little longer, see if any other problems crop up with the 6P. I can tell you the note 5, while a nice feeling device with a great camera, it doesnt hold a candle to the 6P in terms of every day usability. TW sucks and the over aggressive app closing really screws with the device...