DST, we have done both of those options. The HAFW we stayed at was Boardwalk Villas (1br), and it was so incredibly nice! Beautiful, luxurious and easy to get into Epcot through the International Gateway. Having the kitchen was lovely. It was absolutely perfect in every way. It really could not get any better! We took pics of the bathroom so we could build it into our house someday!
The price was really very high. It was worth it, but still it was a budget killer.
We have also had connecting rooms at Port Orleans Riverside and also at Caribbean Beach Resort. You have plenty of room to spread out, but you do have to take the bus to Epcot (where you enter through Future World. This can be tough for older guests who will need to walk around to World Showcase), and you have no access to a kitchen However, the resort is wonderful and homey and we love it. The price for two rooms was way less than the HAFH one-bedroom.
If you can swing the $$$, go with Boardwalk Villas or Beach Club Villas for the luxury and location. You won’t regret it! If you are on a budget, the mods will be completely lovely.