I believed i answered your previous post. but you are on the right path:
I just want to mention that if you are using the express check out, then you will need to make these changes in the pp_receipt.php which is under the WA_Universal_Email/Template Folder.