That's essentially what was done in both cases. Part of the difficulty is that dual row header generation isn't currently working so we have to find another source (I used the pi 3) and then draw the silkscreen around that. Initially that didn't work because something in breadboard managed to change the scaling in pcb.
Peter