Scud,
Welcome to the forum!
First let me tackle the hammer follow issue. I'd highly recommend you have the parts replaced (hammer and sear). If you get a competition hammer you will enjoy a crisp clean break that is light
and SAFE. Given the fact that there was worn parts causing the hammer follow and that the OEM parts are not fully hardened (case hardened). Any further rework to the hammer/sear is not going to last and it will round again inducing an unsafe condition.
So how did the hammer follow happen? Do you have a trigger with an overtravel setscrew? If so, then you need to adjust it out so that the hammer hooks clear the sear when releasing in SA. If not, then you gun does have a timing issue (maybe multiple). I'm not sure the best route to address a SA timing issue if new parts don't address it.
https://cdn1.cajungunworks.com/wp-content/uploads/2020/07/28155351/How-To-Adjusting-Trigger-Screws.pdfModifying the OEM disconnector or purchasing a new part will help solve the problem of the hammer catching the disconnector upon slow trigger pull (1st issue). I'd guess that the timing was advanced when the hammer was reworked and it is causing the fall to DA issue. I highly recommend a new hammer and sear.
https://cajungunworks.com/disconnector-timing/I'd suggest a Type 2 disconnector, a competition hammer, a replacement sear, and a floating trigger pin from CGW. If you wanted to go the full monty, you could just get the Pro kit. You might still have to modify the timing but there are tutorials out there but it is easiest to just call CGW and describe your issue and he will walk you through the solution.
Cheers,
Toby