Linux CNC will certainly work but the configuration would be a life's work. It is really hard to configure even if you are using it for the intended use.

Calling any change "an upgrade" is very premature, I think your time would be better spent outlining the problems you are having and trying to solve them.