Change GFCI outlet/switch with regular switch
You should be able to simply swap the switches. 

This is your current wiring (grounds have been removed to make it less confusing).



There should be no problem with you swapping the switches like so...