So, the distinction here, as per the ever-prudent St. Francis de Sales ... is that, yes, in obedience we give up our will to do that of God. That's the correct definition and explains why sometimes we must actually reject the commands of our superiors because, if the command that we do something that we consider to be contrary to the will of God, such action would be formally opposed to the very intent behind obedience, since we'd have given up our will in order to do what God does NOT will in those cases, but rather what our superior wills. We are not giving up our will to do the will our our superior, except insofar as it reflects the will of God ... but we take it as such in all things but in those where their will contradicts the manifest will of God, as taught by the Church, the Doctors, and the saints.
Very few can go wrong by following St. Francis de Sales on nearly all practical matters, and use his "Introduction to the Devout Life" as their guide. He was rooted in common sense, in reality, and in the application of principles to reality by the exercise of prudence far more than many of the saints who lived on a different plane than most mortals and were therefore unable to relate to normal people. It's like the teacher who most certainly has great and profound knowledge of the truth, but he's unable to actually teach is since he can't relate anymore to the level they're on.