Is an Al P an upgrade from a C2?

I carry a C2 pretty much daily. I’ve started competing I local IDPA and have been using my C2 with 17 round mags that I typically train with. Every time I reload a 17 round mag I worry I’m damaging the ejector, though I haven’t seen any signs yet, and I feel the urge to clean my gun after every match, since it’s also my EDC. I’ve been considering picking up a P to use as a comp/battle belt gun and preserving my C2 for carry. I’ve got a friend with an aluminum framed P, but I was really leaning more towards the steel for the comp, but his comes with extra mags, a holster, and an optic, all for less than the price of a new steel framed P. My biggest concerns aren’t really recoil, more snapping an ejector and the constant cleaning, but I’m not really sure if it justifies the expense of a new gun. Now, if I knew I’d get those things, and a more controllable gun I could shoot faster, then i could probably talk myself into it.

Yes, I’d love an XC, but that kicks me into open class. Plus my C2 already costs more than my car.