Yes, you can wait to send in the amended return and payment. As long as you pay by April 18, 2017 there will be no penalty or interest.