Looking to upgrade my EDC

I've been carrying Leatherman products for 8 years now. My favorite to this day is a Charge+ I've had for probably 4-5 years. I carry it for work which I'm a dairy farmer and it gets used heavily. I've sent it in once for repairs and still just love the thing. The gut hook on it is an amazing tool and use it all the time cutting twine. I'm not aware if any others have it but wish more would. I have also carried a Surge in the past, and have a couple Wave+ in the house and garage if I ever need one and it's not on me at the time. When not working ive been carrying a Skeletool for probably 3 years. I like it but not something I love. I'm looking to upgrade it. I'm open to suggestions but at the moment I'm leaning towards the Free P2 and Curl. They are more similar in size to the Skeletool, but way more tools. Oh and they have pocket clips. That's a must. Any opinions on the 2 or a different suggestion is absolutely welcome. I can find the P2 and Curl between $90-$100 so cost difference is negligible. Not interested in the ARC. I'd buy another Charge+ if I were going to a bigger sized tool.