Carb rebuild would be a great plan. If the pump
is oem rebuild it rather than replace. You’re not going to be able to do any fine tuning of the muffs. You need to be in the water for best results or a very large test tank which most don’t have access to.