I'll offer one slight criticism of your itinerary. I think as you plan and research, you'll find you want more time in both Tokyo and Kyoto.
Given your interests, I would consider skipping Osaka to get the extra days. You can still fly from KIX to Okinawa, it's about an hour train ride from Kyoto right to the airport train stop.