To me it looks like I better start over but I don't want to wipe my F22 install. What is the preferred way to get a 'clean' system so that I can try again? (concerned about sanlock complaining about name conflicts)

I'm quite confident you can save your setup.