English conditioning w

is this correct? Suddenly, Jane reminded me that that wasn’t the first time I had made the same mistake. or should I say Suddenly Jane reminded me that has not been the first time I had made the same mistake? how to say that correctly according to grammar rules? maybe it's: reminded me that wasn’t the first time I have made the same mistake?

are there any mistakes? On our first overseas trip together, a decade early, we had spent a few days in Amsterdam and shared memories of get lost amongst the canals and friendly locals helping us find our youth hostel.