Even if the result is the same, you have to distinguish if you are motivated or merely self-disciplined in a field. That is why I believe that you can be one and make up for the other.
I would describe both as means to make you act. That is one step. Your skill and your effort can be described as features that will determine the result of your action.
You can be successful if you act and your action is good. So you can be successful without discipline, self-discipline or self-control.
I am not implying that they are not important. I believe in self-control and self-discipline and I am disciplined myself.
Practically every good feature increases the chances to act and the chances your action is good.
If you are self-disciplined and motivated and passionate but have no skill or talent, you will probably fail. Since its not enough only wanting to do something, you have to be able to do it well.
If you are not self-discipline nor motivated nor passionate but have all the skill and talent in the world, you will probably fail. Because you won't do anything and your skills will go to waste.