TL;DR: Discipline beats motivation
Both are tools you use to apply to your own exact situation. Person A may vote for Team Motivation, because that works for them. Person B may vote for Team Discipline. That works for them.
The more accurate your self-knowledge and self-awareness, the more effective you can apply the tools (discipline, motivation, etc).