Why not just use a quick & dirty modify of the multishot mechanic for repeaters as a temp fix? Multishot appears to work fine with no oddball lost shots. If this has been suggested before, I apologize. I didn't see it in the forum search.
A jury rigged game mechanic that works right is better than a broken one that is "supposed" to work. I understand the want to make it work right, I do. But in the mean time maybe?