TurboTax Deluxe will do everything you need. You can buy a download at the following link.
https://turbotax.intuit.com/personal-taxes/cd-download/deluxe.jsp
Form 1040-X is the amended return. All versions of TurboTax include it. When you say that you are amending, TurboTax will automatically create Form 1040-X.
