I would say do both. You are there for 7 days not 3 days, so that's plenty of time to do both. You only need 2 days at Universal tops. Probably can do all the Harry Potter in one day with a park to park if you go at rope drop and then stay till night.