Bigger diameter will give you more lift and better hole shot all else being equal. You have 2 props so I don't think you need more blade in the water. Bigger blades are better for heavier and slower craft, smaller diameter is better for faster craft. A 25' sailfish with 400 Hp should be a fairly quick boat. If I was you, I would stick with the lower diameter. The HPDI's should have more torque and make the max power at lower RPM than the 4 strokers. If you go with bigger diameter more than likely you will need less pitch .
Of course all the above will depend on how much load you have too.
Why not run the motors in with the 19's you have , when you have say 5 hours running run them at WOT and see what RPM you get, then you will know what pitch you need.
Every inch you move up or down will change the RPM by 150-200 RPM all else being the same ( load and diameter).
Good luck with it, actually it is not a bad problem to have, brand new engines, good reliable running for 10 years.