This is a TEMPOARY solution as Quickbooks sternly warned me when I switched to the old layout that having the ability to switch to the old template would be removed in the future.  Users will be forced to use the new template.  The HUGE logo in invoice emails issue is an obvious bug that must be addressed before eliminating the option to revert to the old template is taken away.