Help me decide: 360 or 400

(Cons) 400 is bigger and heavier but (pros) has more power potential, Adding after market aluminum intake and headers etc... will close the weight gap, my vote is 400, mod for mod 400 wins.
Only problem with this, is what happens when you apply the same aluminum parts to the 360?