Yes I do. Shoot me your email address and I'll send you a copy of my 2009 itinerary (I didn't do so much in my 2010 trip.) Don't bother buying a Japan Rail Pass unless you're crossing Japan, you won't use it enough in Tokyo to make it worth it.
Yeah, it's true. The only other carsy stuff we did in Tokyo outside of Autosalon was Toyota Mega Web and History Museum (the history museum is free and worth it to see some rare cars.) Super Autobacs Tokyo Bay, make sure you visit the upstairs bookshop for rare Japanese sales brochures, manuals, magazines, books and posters on nearly any car you can think of. Nismo Factory, don't bother, you can't really see anything and they have more merchandise on sale at Autosalon.