Thanks. It does appear that NU9020 isn't for the Nav units. I made a blind assumption that the files went NU9017 > NU9020 > NU9021 but that's wrong.
Hopefully I can get a hold of the NU9021 files soon and try another update.
Other than the units being in imperial rather than metric, everything else is working properly.