Generallly, 600 is a bit small for 400hp, and may choke your top end.

if 6 cyls look good, and only 2 look lean i'd do a compression test and leak down to verify it isn't mechanical in nature.

you could rejet your 600, or just get a 750 and work with that.

How do you know you are getting 400hp?