Changing motors and what prop for it

[TxRanger1]

I have a 481 vs Ranger 1990 vintage with a 1990 Evinrude XP and run a 25p 4 blade shooter. The set up performs extremely well and now am changing motors to a 2003 150 mercury with 12 hours it. The merc has a 3 blade 21 p prop on it and I am pretty sure tat prop will not be the right one or my boat. When I change he motor I am adding a 3 inch jack plate.
Anyone have ay idea what prop I should look at for this motor and boat?
Thanks

[21XDC]

23P Tempest Plus or Trophy Plus if you want a 4 Blade.

[TxRanger1]

I was thinking the 23 Tempest was where I would start. I had a 4 blade on the old motor and liked it.
Thanks