I've been reading a lot of Cal Newport and challenging the advice to "follow your passion" is a core principle of his. As you note, expecting a passion-oriented career to be without problems leads to disatisfaction and decreased motivation. Cal advocates for getting good at whatever career you follow, so you can take career satisfaction from that.