Laura, no flack from me.....I was going to make the same suggestion, but I'll just say ditto to yours. except I would vote for staying at a small hotel with lots of charm away from the airport....but the airport location would be much easier the morning of your flight with the advance check-in reqirements.
I'd probably suggest the river journey without the dinner included (sort of an open-air barge type thing that are very common and easy to jump on right at the moment), and either pre-cruise or post-cruise have dinner at a lovely little sidewalk cafe.....then you would have also had a really French experience of dining, too.
The buildings, Eiffel, the bridges, the mini Statue of Liberty (you probably know the one in NY was a gift from France), etc. are so lovely in the evening........and you will see all the local young people who meet up along the river banks.
Better to have just one night in Paris than to have never had a night in Paris :)
Have fun, and safe travels!