Is this a distinction without a difference?
In the original qualitative write-ups for the Marshmallow Test, they described the children using all sorts of distraction strategies to basically make themselves forget that there's a tasty marshmallow sitting right in front of them. Maybe this is all that self-control is - having enough self-awareness (and valuing your future self highly enough) to direct your attention elsewhere so that temptations disappear from your view. It fits with the neuroscience we know about consciousness as well (that it's effectively a brain network which taps into the other brain networks and can observe and direct their firing) and even into how attention mechanisms in GPTs work.
It also is how most mature adults approach the world. If you're an alcoholic, don't go to the bar. If you're married, don't go to the strip club. If you want to lose weight, put less food on your plate. Most of what we know of as self-control is really having the skills to avoid temptation.