Bigger valves are a win win. The engine should have ZERO problems with a 2.02 valve. Between the two heads, you choose which fits best.
The M1 DP is a fine intake and capable. While the RPM style intake would be better, I don't think it is mandatory to use for 400HP at all.
2 things stick out on this build;
1; Talk to Hughesengines for a camshaft for the goal.
2; You current exhaust size is a fork for the goal. Graduate on up to 2-1/2 inch piping.
Your goal depends on a good balance of the above two parts.
