Yes, that is what you should do. You should never request an ITIN for someone who is SSN-eligible, always wait for the SSN even if you need an extension.
