I can offer zero support on any other engine suggestions, but I would wholeheartedly swap any new components from the original engine to the replacement engine in a heartbeat.
Lol. Just park it outside for a short time.In Florida it is often already warmed up. Just crank for a bit.