The best way to step toward repealing ( or at least circumventing) Hughes would be for real, state-sanctioned militia to authorized private purchases of M4s and M16s, etc. for militia training and use.
This can't be pre-textual, it has to be an actual state militia. In such a case, private ownership would fall squarely under the protection of the amendment.
State LE enforcement could provide letters for those accepted into it's militia service. The more regulated it is the more credibility it would have. Doesn't a new, select-fire M4 for under 2K sound pretty good?