Seats usually do open up closer to the date though. I think it varies somewhat by the sector you may be flying, but even during peak holiday season with completely full flights, I've seen availability from a few days in advance.
If you decide to change to the LGW flight and upgrade, can you change back to the LHR flight if availability opens up and retain your upgrade?