“It was Saturday morning and my boy friend told me he was going to pick me up or was picking me up at 8 pm to go out for dinner at a fancy restaurant downtown
Why not past continuous as we can suppose the restaurant has already been booked it is more than an intention and there is there is no need of confusion at 8 indicate that it is not now .