Have you tried calling AE about this? I suspect that they won't let you combine the two PNRs into one, but if they do allow you to do that (and you might even ask at check-in at LHR), you could end up with note saying that the "cert" was lifted at LHR. Who knows what they might say in YYZ.