I take small carriage head bolts, chuck them in a cordless drill and work them against a bench grinder until they match the shape of original rivet head. I then epoxy prime and have them painted body color with all of the other small parts when its time for final paint.
No cumbersome/awkward riveting, and the rivet headed bolts won't get chipped and rust after you tighten the nuts down.
