For an ITIN, I'd either apply for an extension (or, less ideally, submit the W-7 application with the return).  It would be more cost effective than filing an amended return.