I looked over the files you attached, and the only immediately apparent errors were in the includes/classes/order.php around line 950-ish in the email section. I'll attach the file with the corrections.
Also it appears you have not yet edited the files in the email directory- if ya don't do that the info will never make it onto the actual emails generated to the customer.
Bookmarks