Yes, wait to Amend, however, if they happen to be still reviewing and April 17, 2018, is getting close I would go ahead and Amend and pay any additional tax to avoid and additional interest and penalty.
However, if they are reviewing right now, hopefully, they will be contacting you shortly.
