I just started experiencing exactly the same issues, and I had an extra issue of the starter staying engaged once or twice. That issue will be solved with a new solenoid and I also had the alternater belt pretty loose. If my issues don't clear up after this I'll be heading down the same path.