There are so many things that could cause this condition. Diag over the internet is tough because I can not hear or see the car when the issue is happening. That being said.......re-check spark plug gap, is it correct? Are you sure? When was the last time the fuel injectors were cleaned? And not with something you just dumped into the gas tank. You can have the fuel injectors cleaned while still on the engine with a MotorVac. Otherwise, take them out and have them cleaned professionally. Any vacuum leaks? Have someone with a good scan tool that can data log watch fuel trims. The LTFT and STFT should not be correcting by more than 5% or so. If either is correcting by 10%+ then there is an issue that needs correcting. Try only one thing at a time or you will not know what made a change for the better or worse.