I agree that two days is enough for both parks. It sounds like you're a Disney pro, so you know what you'll be looking for. You will notice that the rides are a bit different than at MK at WDW, but noticing the differences is half the fun. A must see is the Electrical Parade at California...