score:13
A comprehensive history of SHAEF can be found at the US Army's Centre for Military History. The relevant volume of the US official history, The Supreme Command, can be downloaded here. Pages 275-78 have the history of SHAEF locations.
To summarise, at the time of D-Day the Main headquarters was in Bushy Park, near London, and the Forward HQ was at Portsmouth, both in the UK. The first advance HQ on the continent was opened at Tournieres, twelve miles southwest of Bayeux, on 7th August, and was quite small.
The Forward HQ started to move to Jullouville, France, on 28th August. This was near the HQs of the Allied Expeditionary Air Force, the Allied Naval Expeditionary Force, the U.S. Strategic Air Forces, and the French command, which were located in and around Granville. The Forward HQ started to move to Versailles on 15th September, and officially opened there on the 20th. A small advance headquarters was opened on 19 September at Gueux, about seven miles north-west of Reims, and the Forward HQ moved there on 17th February 1945.
At the end of September, the Main SHAEF HQ started to move to Versailles, and that was completed on 5th October. A Rear HQ was left in England, which moved from Bushy Park to Bryanston Square in London on 9-10 October.
So both the sources in the question are partly wrong, but an accurate answer is quite complicated.
Upvote:8
From Dwight D Eisenhower we get a list of residences, including:
Early 1944 - Early March 1944 Grosvenor Square, London, England (SHAEF Headquarters)
March 1944 - Early August 1944 Bushy Park, England (SHAEF Headquarters and Portsmouth, Advance Command Post)
Part of August 1944 Tournieres, France (Advance Command Post in Normandy)
Part of September 1944 Granville, France (SHAEF Forward)
September 1944 - February 1945 Trianon Palace Hotel, Versailles, France (SHAEF Headquarters)
February 1945 - May 1945 Reims, France (SHAEF Forward)
where they distinguish between SHAEF HQ in England, Portsmouth Advance Command Post, Advance Command Post in Normandy, and SHAEF Forward in various places, and SHAEF Headquarters in Versailles.
At ixengineercommand.com one finds a thread on SHAEF HQ movement, quoting a book from the Office of the Chief of Military History (Army). There it states that
At the end of September, various echelons of SHAEF Main began their move from the United Kingdom to Versailles by air. The move was completed by 5 October. Rear Headquarters, SHAEF, consisting of approximately 1,500 officers and men, moved from Bushy Park to Bryanston Square in London on 9-10 October. A small contingent was located at Goodge Street Tunnel, which was now used as an underground storage place for important SHAEF records.
Apparently the book is available at ibiblio.org so you can read the entire section. Even at the end of the war portions of SHAEF remained in the UK. Interesting reading though.