We have been struggling with this exact problem and here it is, asked and answered, in the forum. We've already replaced one spar and rib thanks to drilled-out holes. We even replaced the Avery squeezer with the Cleaveland Main Squeeze (which just made it easier to make ate-up rivets).
Our problem is that the shanks slant. Of course, now we're energized and in tonight's building session, we'll try both of the solutions recommended here.
We also wondered about the -5 rivets used on the rib. They're going through the spar (.040"), cap (.040") and rib (.020"), three layers total .090". The plans also call out the -5s on the hinge bracket attachments (three layers total .140"), and they call out -4s on the spar caps other than the rib location (two layers .080"). We wonder if a -4 would meet the structural requirement without generating the drama and stress that Dan, some others, and we two Rong Brothers have been through.
However, we have not found anything like an error in the plans and are reluctant to second-guess Van's, which has been 100% clear and correct so far (as a guy who reads and writes a lot of tech documentation, and has been around experimental aviation since forever, the plans are startling in their quality).
Our usual default answer to trouble is, "we're doin' it wrong." When we've gotten an unsat result, that's been the answer 100% of the time so far.
(Rong Brothers? Well, we're brothers, and we're not exactly the Wright Brothers).