A "stokish" 360 vs a "stockish" 400 is a close choice. That said, I would probably put my money on the 360. The 400 with stock stroke is hard to build. The 360 has lots of choices and available parts... including Magnum heads at moderate cost.

If you make that 400 a 451 with 440 stroke crank it would really be worth it. But bigger budget.