If i remember right, the diodes for the diverted switches aren't mounted on the switches, but on the underside of the pf on the bottom left side. Check to see if these are cracked and need to have the solder reflowed as well.
I know op said he fixed the switches, just adding this for anyone searching for the same issue.