Sounds like you are on the right track, the only other possibility could be your ignition taking a dump, but it does not sound like that. I think you have already found your problem.