Quick update:
4 Wheel Parts did not think the 315s would be kosher and would not install them, so it wasn't worth the trouble and I ended up returning them. I have been traveling the last few weeks, but I did swap in a new 4WD switch last night. Started getting Service 4WD message again and the switch was acting up. I have already replaced the encoder motor ring on the t-case last year, so hopefully now both of the known failures in the 4x4 system are now fixed.
This new 4WD switch has a bit of a weird orange color to the lights that doesn't quite match the old gauges/switches, but for $33 in amazon I really can't complain.