Another option might be carriage bolts if you can find them with heads the right size, and file/machine off the flats. Or even punch the holes square to fit the flats. They typically have a flat domed head that looks pretty close to the original rivets in shape.
