Disney World or Disneyland?

Disney World just because it is so much bigger with so much more to do. Like you said, Epcot itself is a huge factor. You can build a two-week vacation at Disney World, but you can't really do that at Disneyland.