First, get a clear title since you can do it with what you have. I'd LATER approach changing the title number from the engine to the ID plate BEFORE changing the engine. The laws change all the time, depending on the state. S.C. for example, no longer requires an out of state vehicle to be inspected by someone. Just the "correct" paper work is all. I know as I just registered a vehicle from Va. I had it on the trailer for them to look at and they "explained" I didn't have to anymore.
Your state may be different but I'd surely get a "clear" title while you can and then have it changed to a different number later.....and as years go by, it may get even tougher, or surely more costly to do the paper work!! Just my .02.