Get a dim-able 1000w, I expect you will end up using it on full power if you have decent exhaust though.
600w is the standard system for a 4x4 space. If you want to use the height, you will need side lights instead of top lights. In that case, make a vert system, put your 400w up top and add LEDs or T5HO to your walls for side lights. This allows a larger area to be in ideal/bud-producing light levels. With top lights you will only have about 16" of bud producing space with needed light.
I think the 600w standard system is less than ideal, with the dim-able 1000w you can run the levels you find ideal.
While you are upgrading take a look into UVB.