That's seems like plenty. I would check and double check how CLEAN and TIGHT those connections are. In other words, REMOVE them and make sure you are down to bare metal where they connect and that the cables themselves are clean. Sounds like you have the grounds covered. Maybe you'll find one or two are just dirty and or rusty. That would make it easy.
