JRPass & Itinerary Help

My itinerary for 7Day JR Pass looks something like this right now:
May 13 - Tokyo to Osaka
May 14 - Kyoto, Nara Day trip
May 15 - Kyoto for Matsuri
May 16 - Kyoto for early morning visit to Inari Fushimi & Bamboo Grove
May 17&18 Hakone for ryokan & onsen experience
may 19 - Back to Tokyo for Matsuri

My question is: If we leave early in the morning for Osaka, will there be enough time to visit some main attractions in Osaka? Is 1 day enough in Osaka? Is there somewhere else I can squeeze in more time in Osaka?

Maybe I should do:
Tokyo to Kyoto (Nara day trip)
Kyoto early morning visit
Kyoto Matsuri
Osaka 1 night
Hakone 2 days
Back to Tokyo

Your help will be kindly appreciated!