Seems to me your motor should have RDL in the model # if it were a longshaft to begin with..

And I’ll bet the gearcase off the 30-hp will fit better.