That's a step in the right direction! Nice piece of wood as well, mine was rather plain. Yes the set triggers can be a pain, it's worth taking the adjusting screw right out if you can and seeing what the end is like? It should have a nice dome on it and not be worn away one side, this can sometimes cause a problem with fine adjustment. Also, I replaced the nipple on mine with a copper beryllium version from Kranks. I have to say it was fine with RWS caps, I tended to use the slightly larger version, 1075 I seem to recall?
Incidentally, the previous owner of mine had removed the trigger guard spur, something that never bothered me as I got used to shooting without one a long time ago.
I have to say, Once you shoot an under hammer you'll never want to shoot a side hammer again!