Sounds like you're in the right neighborhood. Be sure to check the ground connections. Maybe you'll luck out and it's just a loose or dirty one.