After overwriting my .tpl file with the one you showed, the comments are now working fine
Have you found anything wrt the Video thumbnails mis-aligning?
Also, the gallery does not add a tab to the main menu (even though the option is enabled). The tab that is there currently was created manually, but now when I'm in the gallery it does not stay highlighted..