I had the exact same problem with my 2.5-16, and found that retarding the EZL plug eliminated the hesitation problem. However my manual states the car should always be on S! I too changed most things just like you...
After many years of pulling my hair out, the main dealer finally pinned it down to a faulty ignition control module! It solved all problems...