I have a ton to rebuild from scratch.
What are the thoughts if I save my settings, do a factory reset, then upload my settings?
Any chance of that fixing things?
If that works it's a quick fix, so it won't hurt that much to try.
I'm pretty sure as L&LD posted that you're not going to have luck with it. All the old settings are being reintroduced and there is one or a few old variables causing the issue that will be right back in the settings.