There are also transition Shimano freehubs that will fit either Hyperglide or Uniglide cassettes.

It might be worth installing if you can locate one.

Many of the Shimano branded freehubs are similar enough to allow them to be swapped.