I have a 1980/81 20 hp mercury that idles fine, but bogs down and or surges while in gear and under acceleration. It runs a little better sometimes with the choke out a little. Carb, fuel pump have been rebuilt, along with new water pump and new fuel tank. Running out of money and patience. Any help would be greatly appreciated.