The aux switches are an easy fix, go aftermarket with the sPOD or VOSWITCH. Both are easy installs that don’t require you to mess with factory wiring and doesn’t require dealer programming. Plus you get more than 4 switches. Switch-Pros is another, but pricey option.