@vincent More than anything else, these are good choices because they are helping you to focus on what makes you happy. I'm confident that the vast majority of people do their best work when they are happy, including the work itself making us happy... so, good job!

Your post includes familiar thoughts and feelings to me, and it's these kinds of decisions I am always happy to have made; sometimes even wishing I had made them earlier. I hope your hard work and intentional approach is rewarded as you deserve to be so.