It's a very good idea to create template modifications as opposed to direct template edits. You can make simple add-ons for each type of change you want to do, that way it's easy to troubleshoot issues by disabling one add-on which is just disabling one particular group of template modifications.