Hi :) I think you got it right. A template is generally meant to be left alone. Templates are usually used as the starting point to build-up a version-specific page more quickly and tries to avoid saying anything that will become out-of-date too quickly. Hmm, ok normal pages 'should' aim for that too but it's not always possible.
Just my 2 cents. I'm not really a team player so i am not sure exactly how it is all set-up but i think you have done exactly the right thing. Regards from Tom :)