Firstly good post I enjoyed reading it. While reading this post I recollected some insights from a book I read few months ago. Hence I would like to recommend you the same book. The book is called Atomic habits by James clear. It is probably one of the best books I have read on habit building and discipline. Do check it out if you have the time.