Replacing the fill valve is probably your best bet, but I would use a Korky QuietFill (part number 528).
I find that they work better and are quieter (they don't have the annoying "water hammer" that Fluidmaster does when shutting off). Plus they have really good customer support in case you...
