See that's the reason I asked. I was surprised at it being left with a rough start but as you have just explained it wasn't rough to begin with, it has gotten that way. The way you explained it previously was that the mapper gave you the car with the rough start.
I would definitely pull the plugs and get a good look at them (maybe even just replace them for the hell of it), same with the coilpack connector clips etc. It sounds like this is only going to get worse.
As said though, it does sound like 2 seperate issues. But I would want to get to the bottom of them, even if it was just to verify the seals were on the way out (liveable).