I went to Disneyland LA a couple years ago, and while it's a nice place just to hang out for the whole day, it's not really for thrill rides. Next door to Disney LA is California Adventure (which you pay a little more to get in to both parks) and has more adult rides.
I said that to say this:
When I was researching Japan, I found Tokyo DisneySea seems similar to California Adventure in that it has a few of the same rides (eg Tower of Terror) and seems catered to more older kids and adults. So if I ended up going to Disney, I probably would've just gone to DisneySea.
In the end, we didn't want to spend a whole day at a themepark especially when we're in Japan, so we just jumped off the train at
Tokyo Dome City for a couple hours instead. Not a lot of rides, but a fantastic rollercoaster.