I was going to move the factory, Installed switch panel and recover the storage space by cutting open the safety plate area and adding the after market switch plate cover sold on this site. However the factory switches do do fit the switch holes and need to be modified.
So using the KISS process, my bottom line was that I just needed some storage space for travel stuff. Hence the Air deflector method. Works great for our needs.