Smaller Diameter, may mean less Blade Area, and while it may increase the rpm, it can also increase the % of Slip. A lot of Prop Lines have the dia getting smaller as the pitch goes up. I rarely worry about Diameter, preferring to let the Prop Engineers do that.
Is the Engine in Good Shape? Good...