I'm dealing with the same challenge, but on a gas piston AR10.
An adjustable gas block would be my first choice. I used a Superlative Arms adjustable block on my AR15, JP Enterprises was the other one I liked.
Too much gas is the problem, swapping out other parts that doesn't reduce the gas flow is somewhat of a Band Aid approach. If you end up needing a stronger buffer spring at least you'll be able to fine tune the system with the adjustable block.
If you need a spring SprinCo has a good selection of quality springs. I was talking with them this morning, seem like good folks..