“Max effort daily driver” 318 build vs “Budget” 400 swap

I still like the 318 here. You'll have it running faster, you'll be way less likely to lose interest plus, you can have longer to build up the 400 for later.