I have helped hundreds of people to try to have financial discipline that you clearly demonstrate here. Only a handful have actually been able to change course. While the details of the plan I would devise might be different than yours, financial discipline is 95% of the battle to financial independence.
(I also admit that I was relieved to see that you didn't entirely sacrifice your 401K to pay off your mortgage.)
You have every reason to be proud of mastering your financial demons. Enjoy your future. It looks bright from my vantage point.