Well, time to move on. While my P6P has been trustworthy since new, it is time.
10PXL is only slightly bigger and all my after market magsafe chargers and stands, as well as my leather belt clip work. So I just needed a new case.
Data transfer from phone to phone was quick and seamless...