I'm not sure I would use a rivnut as a ground.
I'd rather use a stud screwed into a captive welded nut or a nut and bolt. I'd also ensure there was bare metal under the ground strap.
As for engine grounds, just do it as the factory did. They probably know what's best.