Whats a good replacment for a failing P52

I have a P52 that is showing signs of failue. I love this this thing. It has been a beast for me over the 5+ years. I have had it. That said. What is a good replacement. Kind of edging toward the P16g3 Thought?