Sounds to me like you have the problem nailed down pretty well. When I read the first bit of your post I automatically thought 'distributor.'

I'd swap the rotor and coil, and if things look fishy you can swap the cap too.