At LHR, 2 hours is totally fine. The much publicised issues of earlier in the summer are now history and things, on the whole, are running pretty smoothly.
At CDG, no lounge available once the AA Admirals Club shuts at 3pm I’m afraid. The CX lounge formerly used by BA is still closed.