I have a 6P currently and ordered the regular size 9P. Waiting for it to come in still, but looking forward to it.
My 6P was RMAd last year so the battery is still good, but I'm hoping to still experience a nice upgrade. Otherwise I might return it.
Sounds like the advice you'd get in the first three comments asking a question on Reddit.