>> I'd like to avoid F360, but for 3D modelling it just seems so far ahead of FreeCAD, which still has the frustrations I have with F360 as someone used to working with git anyway; really I just want to learn OpenSCAD or similar well enough.

For MCAD give SolveSpace a try - https://solvespace.com/