Yup, better to die on that hill and have a code base that's manageable vs a mess that gets out of your control that you still die on!