Also check for vacuum leaks around the intakes. Does sound like a CDI going wonky though.