Well, I ended up with 39x25 and that seemed to work well. Managed to get up Col de La Ramaz and Joux Plane with no problems (albeit rather slower than the Tour went over) Not sure a lower gear would have been neccesary, the slope wasn't much it was the length that was the problem.