So, a new fuel filter, air filter and new plugs and wires cured the issues. The plug wires on #3 cylinder had been arcing and for some reason the back latch on the air filter box had come loose, so at times it was sucking air past the filter.
Running smooth and much quieter now, too