If it were me, I'd see if you can get the Chassis Serial Number put on the title to end the problem with swapping motors and not having the title match.
Mike B
Mike Boteler
1956 Chevy 3100 Resto Rod 1952 Willys M38 Army Jeep 1983 Jeep CJ7 Laredo 1984 Jeep CJ7 +++++ Silver Spring, MD