Is this a show truck? Butt weld would be best but I think most people lap weld. Flanging the patch would look better then a lap welded patch. I'm still planing on butt welding my 78 floors, but that might change.
as far as fitting, get the hammer out, I'd line up the ribs in the pan so it...