Spent a few more hours on the floor tonight. Think I have it about 2/3's of the way lined up. There are still gaps between the firewall and the floor, but I don't think I will be able to get them all hammered out. I think I'll have to spot weld as best as possible, then use seam sealer for any gaps.
The drivers side is looking better than the passenger side.
Middle-ish - The lousy weld job I did on the lip is making this a bit harder.:
A bit more to the P/S.
More to the D/S: