Just to throw this out there, unless the swap was done correctly, a 400 is a bad idea with a 350TBI setup for many reasons.
Since you will be replacing the motor, if you can't be sure the PROM has been modified, and that fueling has been fixed with more fuel pressure or larger injectors (and maybe even BBC throttle body) then I'd seriously consider throwing a 350 back in it.
Without proper tuning, that 400 is and has been running lean since installed. Could very likely have contributed to what is going on. This of course will be true of any engine installed that requires more fuel and different timing than a bone-stock TBI engine.