Do not include your old 1040 nor your revised 1040 because the Form 1040X reflects any changes there and becomes your new tax return. This is key. In the Instructions for Assembling your amended return I can't find anything stated there that contradicts this interpretation.
