I learned long ago to keep straight edges on parts until the routing of tenons was done, unfortunately I never remember!

Templates and DS tape are the bomb, so handy for doing what you are doing so well 👍