After you file

Yes if you owe.  Be sure the 1040X shows the original refund you got on line 18.  The amended return won't be ready until the end of March.