Alternatively, book both flights (evening and morning) to add comfort and knowing that you'll make it back either way - though this will obviously cost you twice as much.

I've had BA change my RFS same day a few hours before departure but that was because of a cancelled meeting at Waterside and because I am special......