Thoughts on upgrading the F1 pump on a Challenge Stradale?

My F1 system appears to be starting to get a little tired. In my quest to just make anything that I can new or better, I am planning on replacing the accumulator, clutch solenoid, and F1 pump with factory parts. Why not?

Anyways, while looking and talking to people, it was mentioned to me that a common upgrade on earlier F430s is to upgrade the F1 pump to the 2006+ F430 version, and that this can possibly also be done on 360s. It is apparently a much better pump. Anything to help me have one less thing to deal with over time.

The parts I was told that need to be replaced on earlier F430 are the follow, but i am unsure if these are the same parts needed for a CS.

222009 Pump harness
248092 bracket kit
248083 Pump kit
228646 Relay

Has anyone here done this? is this actually possible? Is this a viable option? Overall thoughts? I will obviously retain and box up all of the original parts.

Thanks for any help.

Another option is this aftermarket pump. Thoughts on this as well for something better that is a little more plug and play?

F1 Hydraulic Pump Motor Ferrari - UPRATED Motor Kit with New Gear Pump - MLREng