So I've decided to use Hex rivets in one of my models that currently uses normal blind circled Rivets. Problem is I have used the Hole Wizard tool that neatly makes all the holes with a 3D Sketch and Patterned the Rivets in the Assembly with those holes.

Does anyone know a way I can safely convert those Hole Wizard holes into Hexagons? My current solution is just draw the Hexagons on the flat pattern (also requiring only one extra feature) but that may get confusing in the drawings.