If you are swapping freehub bodies, go 9 speed and you have 7,8 or 9 speed capability.
Crank fixing bolt washers are no joke. I once broke a removal tool trying to pull a crank over the washer☹️
Please dont post any more pictures of that IM without adjusting those bars😉
__________________
I don't do: disks, tubeless, e-shifting, or bead head nymphs.