Yes, I think it's better to veer toward a longer estimate so you have some breathing room if they do actually take that long. Rushing around during that week, given transportation challenges (crowds, traffic, etc.) is next to impossible, so I think you are smart to give yourself more time to do things in general.