I got distracted on the way to Kyoto so I can not say from experience, but from what I understand, you could probably take a day trip there and see all the stuff you want to make you happy. Osaka is an amazing city with a lot of everything, and is your better choice for nightlife. Spend as much time as you want in Tokyo, you’ll never see everything you could and you’ll always want to spend more.