Changing a standard prop by 1" will give an increase or decrease of 150/200 rpm.
Assuming all figures are accurate, the boat/engine are correctly trimmed & you are running with your normal load then you need to drop around 750 rpm.
Prop pitches are normally in whole numbers & I don't know if props for yours change in 1" or 2" increments.
Something around 17 might be worth a try.
ETA Whilst I was doing mental arithmetic it seems you & PD have had the same thought process - just a bit quicker