As the next step to try, your approach is most logical. It is a good Gunsmithing rule to always try to replace the cheapest part first.
I had one hammer spring that began to give light strikes at under 19,000 rounds. I replaced it with another one which has gone a good 70,000 rounds without light strikes since. Sometimes one hammer spring is more fragile than another.