Hi jessawells,
Your logic behind the calculations on thermodynamics is fine. But ATP synthase has 3 catalytic sites, and 3 ATP molecules are synthethised per 360 degree revolution of the rotor subunits.
So the number of c-subunits in the c-oligomer should be calculated for THREE ATP...