I decided to go to Japan for the first time and have booked this trip as a BA holiday...I went for F for the LHR/HND/LHR legs since the booking tool switched me to this indicating it might be cheaper and I was OK with the price. I realise this is old style 787 and it will be a killer as far as jetlag goes.

I had a quick scan of flights and at the time thought there a few options if the outgoing connection goes wrong (at the new 75 mins connection time), I have experienced a few close calls with EDI->LHR delays in the past.
I didn't go for other outgoing options because the price differences were too much (thousands).
However I'm still a bit nervous so am wondering if anyone can give advice on alternatives if I miss the connection and need to accept rerouting quickly.
I really want to get there the same day as above, the Japan Airlines flight is a lot later. There seems to be an option via CDG arriving mid afternoon but if that went wrong it might not be great.

Any thoughts?

I'll check the options again much closer to the time.