Used the AN470 rivet removal tool as well as a few drill bits to get to work on the spars to salvage the doublers, hinge brackets, spar caps, and HS-1008A/B brackets.  The dome rivet removal tool is well worth the money as it made drilling the rivets out very easy and replicable.  The flush rivets were a bit more work but I still managed to get the work done.  A good tip is to use the back side of a drill bit the same size you used to drill out the rivet for snapping off the top.  This works much better than using a punch as the bit is the exact size you want.  

Use the back smooth shank of a drill bit (same size used to drill the head) to snap off the rivet head.  

Whole bunch of drilled our rivets missing their factory heads.

Sorry rivets, you almost made it into an airworthy part!