The problem is that you waited to long to deal with your problems, makes everything more and more difficult.
Ignoring the problem for around 4month and the point that you did additional changes around your systems + not maintaining your pacnew files.
This pacnew files are changes around your setting files that showing up after the developer created some changes. Stuff that gets removed or stuff that adds in there.
Even after reinstall you will face them after time, it won’t take long to merge this stuff, but its a part of the maintaining.