Everything you said is correct. As for the amendment, you will know the amount prior to mailing it off, so include any payment when you mail the 1040X. Even though it may it may take months to process, the payment will be considered as 'received on time' if postmarked by 04/17/2018.
