[spareparts]

sounds like a good swap, I'd suggest starting with a 23P Mirage, that should put you in the low 60's. That engine is rated to turn 4800-5000, you may need to step back to a 21P depending on how its loaded. Trim tabs are a must