I would add a 3rd day for Universal's waterpark, Volcano, Bay, which is far and away the best waterpark I've ever visited. And as the original poster said, you'll want to get park-hopper tickets if you want to ride the Hogwart's Express between the two Harry Potter lands.