Yes Jim, those M31 verticals are truly fine engines, while the M30 twins may be even better. Can occasionally be gotten at almost embarrassingly cheap prices, though I don't see the low listing prices much anymore like I used to see.
I think mine would definitely benefit from a softer governor spring, and most certainly would run better with a load, which I think one of your beautiful Baker Fans would be perfect for that task!