I made a slightly more ambitious tool for riveting. Essentially, it's a lump of steel plate with a long slot in it and a couple of tubes welded to the end, either side of the slot.
One tube supports the dolly, as in Nigel's tool, the other acts as a guide for the punch, keeping it aligned to the...