I found I was getting the same problem as you - very odd. It just seemed to randomly revert back to the default template. I solved it by setting a symbolic link from ‘default’ to my new template. On the command line, delete the old ‘default’ folder and then do the following command while in the theme folder:

ln -s path-to-your-theme default

Seems to work

HTH