I disagree. The goal was to get the Germans out of France to stop Nazi expansion throughout Europe. Liberation, regardelss of the motive, was the goal. Yes, we did it for ourselves only as a matter of preemption ... but the fact is that they were liberated because we wanted the French, not the Nazis, in control of France. Liberation was the goal, the defeat of the German Army was the means. Regardless, I would hope that you and I would certainly agree that the actions of the French in this matter has been outrageous.
The first goal you mention is correct, your second "goal" was simply a byproduct or stepping stone on the way.
If there had been a militarily advantageous method of attacking Germany directly, bypassing the "liberation" of France, we would have certainly gone that route.
Further, I am sure that given the choice, the French people would have prefered we had gone another way. Why have two foreign armies destroying your towns and villages if there is a second solution ?