You must have forgotten about wood-headed Republican and Independent primary voters in NH.
We don't fix this, we don't fix the system.
Every state should get no more delegates than electoral votes. After that, the delegate award formula should be based on the number of GOP senators, congressman, governors, state legislatures and, most of all, track record for delivering GOP electoral votes in no more than the last five or six election cycles.
For the sake of argument, I would propose a formula such as this:
e + 2e(Ao/Po) + 4e(Ad/Pd) where
e = electoral votes
Ao = actual official offices controlled (U.S. Senators + Congress Reps. + Governor + control of each house of state legislature)
Po = possible number of official offices controlled
Ad = actual electoral votes delivered in the last five or six election cycles
Pd = possible number of electoral votes which could have been delivered.