Sounds like you have it going in the right direction. My solution for a stiff trigger is to work some powdered moly into the contact points of the trigger, i.e. trigger to sear to hammer.I use a wood toothpick to get it in there.This reduces the friction at those points and after a number of shots tends to polish it somewhat. On one of my guns it reduced the felt trigger pull by almost half. There is also a product, I think by Birchwood Casey, that is a spray type moly lube that others have had good luck with. Good luck with it.