It may also be worth calling BA and asking how much the change of destination to the outbound is. There are no change fees at the moment so the re-price might not be extortionate, particularly if this flight is still some way into the future. It would also have advantage of keeping everything on one ticket and protecting all your connections.