1996 XJ6 VDP, Hesitation/stutter/stalling problem.

Hi,

I have a 1996 Jaguar VanDenPlas with the 4.0 liter 6 cylinder engine with 100,000 miles. A strong runner, well maintained. However sometimes after long drives mostly during warmer weather it will hesitate when I accelerate or even stall at idle. Usually when it dies I can restart it right away, but occasionally it will immediately die. I will accelerate the engine over 3000 rpm's and then it will drop below 700rpms and die.
Like my other Jag, a 1994 XJS with a similar problem, I am assuming the Mass Air Flow Sensor, but I am not ruling out the throttle position sensor or the ignition module.

Any help would be great.

Thanks,

Jason