I have a bone stock OHC 68 convertible. I've been tempted many times to change it but since it's a complete car I'll stay with the 6, although I may change it to a Sprint 6 when restoration time comes. But had it been as you discribe yours I'd go with the 400, even though I have the same car I think you're making the right choice.
And welcome to the FGF forum.
Wanting a Custom fit in an off the rack world.
I don't have time for a job, I just need the money.