I have good used starters, the XB9 & 12 use the same starter so I doubt you need anything bigger than stock. If anything, higher CCa battery.
I suggest you check relays, starter and battery connections well as your ignition main harness near steering neck.
Don't buy new unless you have to. PM me if you want one or any other parts on your list I may have as well.