Disk brake swap/tire lean

First thing I would do its get the engine back in it

I agree.

I just did mine six months ago, and we trailered it to the alignment shop. BOTH front tires were tipped in at the top. We set the ride height and then the alignment. All is good now.

Before



After