Are all these "issues" occurring on a single system or are you managing like 3 different stores all of which are experiencing different levels of operation?
As far as the files provided. Unfortunately for the 1.5.5 version, the additional effort was not made to pull the changes out of the base files at the time the update was provided. Therefore, it is important to understand that the modified ZC files provided may not be completely up-to-date with the files on your system. But, the changes made to those files are relatively identified and should be made to the file(s) in your system. It could be that something else on your system made changes to the applicable header_php.php file and when replaced with the calendar version there are problems.
Now, when someone says they are having a problem, the typical next question is what is the problem and back and forth until information is provided. May I recommend book marking the following instruction related to receiving an error, blank screen, pretty much etc... http://www.zen-cart.com/content.php?124-blank-page
The information provided will help much more than "doesn't work" style reports.
If I may put it another way. I'm trying to help based on the information provided. So far there appears to be three different issues that remain unresolved or perhaps they were each individually resolved but there is no discussion about how or why. There's discussion about having upgraded without describing how that upgrade was performed, what else might have been modified, etc... make a lot of changes at once it becomes difficult to identify what the problem is and how it was introduced as compared to incremental changes or planned modifications. Anyways, hope that can sort things out. Right now, my recommendation almost is to reinstall the files from the plugin by merging/verifying present the changes needed to support operation is made/carried over.
ZC Installation/Maintenance Support <- Site
Contribution for contributions welcome...