As an electrician I can say u/Yummy-Beetle-Juice did you a solid and wrote out everything you need to do to solve your problem. If you can’t or don’t want to figure this out call an electrician they should have it sorted in about an hour.