Takayama is definitely (modestly) harder to get to, but I remember it being the highlight of my first trip to Japan. Obviously, it depends on personal preference, but I think the itinerary presented is more than doable. It will not be particularly leisurely, but probably leisurely enough for the typical go-go American tourist (which would include me!).