What about manually editing those files? I'm sure they are fairly standard / easy to understand menu items, maybe you can try to resolve the address issues it seems to be having trouble with?
That's weird that removing basically all traces and re-emerging still gave the same problem
