jen, i went with the ANA package to osaka and tokyo - 7days and thereafter i extended on my own. If u want F&E, u should do extention cuz guides will probably bring u around in the nite the take the subway, from there u will be able to learn alot.
Osaka is beautiful, visit temples.... at mt fuji, we went all the way up to 5th station and did some hiking. breath taking and weather is perfect, cold up there tho' as it is autumn.
But for Disney, it's been terrible, crowded everywhere, it was sunday and the next day was public hols so u can imagine all the japs were there. we didn't even get to eat and drink, rides and food queue is super long throughout the day, so i suggest u bring some a bottle of water with you.