The new WPPSI-IV would be a perfect test for him. It has extended norms (unlike the WPPSI-III) and also unlike the previous version it is just more preschool appropriate, i.e. it has ways to answer questions that don't test fine motor, which most preschoolers, and many gifted kids, have issues with.