The Panopticon/Last Night

The Husbands of River Song shows the Twelfth Doctor with River Song visiting Darilium and the Singing Towers. But does that make Last Night invalid. In Last Night the older Eleventh Doctor confirmed to the younger Eleventh Doctor that THAT was their last night before he sent her to the Library (in Forest of the Dead/Silence in the Library). And wasn't their last night together the point where he gave her the screwdriver? And in Silence in the Library River said that the Doctor showed up on her door-step with a new haircut and a suit, and he shows up like that in Last Night AND The Husbands of River Song. Plus The Husbands of River Song doesn't say that this is their last night, but the Doctor says this himself in Last Night. The title even says this.

I'm confused at this The Husbands of River Song/Last Night thing.