Hi Zeke,
Just to give you an idea of the looks of a refreshed S/42:
If you compare it to yours, you'll see that your S/42 is in a pretty nice condition. It's a difficult decision and I personally don't know what to suggest. Both refenishing states have their own charm.
The grips are Nill Grips, very good replacement grips.
The S/42 is my regular shooter, reworked by Frankiona, Germany a couple of years ago. It's a very late 1937 version.