Hey Festdewalkita,
If I understand you right, and if you are satisfied with your Onefinity Classical Series (except the points mentioned), you could wait for the Upgrade package to Elite.
There are many reasons to choose the Masso G3 Touch and the Masso closed-loop steppers. I did not run the Masso CNC Controller, but Tom @TMToronto does since a considerable amount of time and I know Tom does not choose hardware or software without deep research on their capabilities.
Think of what you will get out of the box: Infrared homing sensors with auto squaring (sensor on masso homepage), Power Loss Recovery, Jump to Line, and Feed Rate Override - Adjust feed rate during a carve. And all that with a probably straightforward retrofit time.