I know I'm late to this party, but I still see the cross-member that you welded up underneath your 8. I concur that I don't think it has the integrity required, nor does it account for the torque-arm that's incorporated into the OEM skid/cross-member. I think you're lucky it hasn't fallen out yet.
It's hard to be certain, but I believe the cross-member your Scrambler came with is, in fact, an OEM late-model cross-member. I'm not sure why it was installed the way it was installed (with the angle-iron), but that's obviously not the original location. You'll also note more nutserts welded inside your frame than is necessary; that was originally done to accommodate the cross-member in multiple locations for different transmission/t-case combinations. Again, it's hard to tell, but I'm thinking that maybe the PO decided to try to install the drivetrain forward a couple inches? Or maybe to accommodate the T-18/Dana 20 combination, they relocated the late-model cross-member rather than acquiring an early-model cross-member?
As for OEM, I agree with what has been posted before, and will confirm that the 304/360/401 will work just fine with either OEM cross-member; the back of the 258 is located in EXACTLY THE SAME PLANE as the back of the V8 family when put in a CJ, with OEM (or OEM replacement) engine mounts. Running the late-model cross-member with a T-18 requires a very minor bend in the leading edge of the cross-member, but it will otherwise bolt-up perfectly. Running the early-model cross-member (that came factory with the T-18/Dana 20 combination) should require no modifications whatsoever.
Otherwise it's a great project! I love seeing more people running AMC V8 power! (But seriously, fix that cross-member issue before your transmission falls out. T-18s and Dana 20s are heavy.)