Now I have to take it out to our property and do some plug chops. Thinking the 400 and 2nd clip position may be a little lean and I'd rather lose a little bit of power to protect my top end.

If you think it's lean on the mid circuit then change the needle.  If not try a 420 main in there without changing the needle. 

I know they say mains only affect 3/4-WFO but I've changed my main and it made a difference from off the pilot all the way to full throttle.  Of course I'm in the 600+ range on a VM44 so I'm not sure if that has something to do with it or not.  But from what I've seen a main change will affect clip tuning as well.