Suggestions for last two nights in japan

We are spending a month in japan in november and i’m struggling to finalize the last two nights prior to flying from haneda on the 20th (our flight is at 11pm)

I would like to visit fuji-q as we wont have time during our week’s stay in tokyo so i’m considering either kawaguchiko which will be close proximity from fuji-q or yokohama/kamikochi where we will do a daytrip to fuji-q.

My last option is simply to do the fuji-q as a day trip from tokyo and spend the last two days somewhere else.

Any suggestions would be appreciated.