I never posted about my success with this mod. After returning the first switch set, I found another on the cheap with the black flaking off the switches. It only took a minute or two to change out the switch faces from mine It was not hard to change these out to the ones from my Leaf.
@estomax thanks again for experimenting to find compatible parts and sharing!