Nice Jeep, and glad to see you were able to work through the challenges of wiring up a newer Jeep.
Some of the issues you are talking about with the wiring, are why when we bought our Jeep about a year ago, we did not want a newer JL model.
We wanted an earlier JK model (ours is a 2018 - see signature).
Ours has been awesome for towing, have had no issues. Is a lot of fun when we get where we going, too.
Best part is the simplicity. Due to the simplicity of the vehicle and its high ground clearance, we were able to set it up for flat towing completely by ourselves. This is/was the first vehicle I've owned that we set up ourselves for flat towing; Always had to hire someone else on previous vehicles.