Rather surprising... Where is the ABYC in all of this?
I may rip mine out and redo it too... although it does seem silly, for essentially just wiring color.
I can make corrections that will make it safe and correct, if not the right color.