William
Bit late to the party on this one!
If you call Jerry at Falmouth Yacht Brokers [FYB] give him engine and saildrive serial numbers he can confirm the precise spec needed.
He’s good on discounts too. He was a star sorting me out with my old D30Classic when we went for a folding prop.
Overall though, sounds like you have good options.
John