Yeah get the Jr pass. Check out the izakaya 'piss alleys' for some old school Tokyo bars and food. Wouldn't bother staying in a ryokan if I went again, expensive and the food is very much an acquired taste - lots of pickled stuff.
Go to a nice place for a steak.
We found an amazing skyscraper...