I finished reassembly of the tins and covers and stuff and started it up and it still did the exact same thing. So, into the carb I went. I found one of the jets had been plugged and I cleaned it out, and put it all back together and fired it up, and no more surging. But, the top end power still seems weak, with the deck engaged it drags the engine down and it has to wind back up, and when I get into thicker grass it bogs down. I guess I'll start looking at the governor now...