I'm pretty set on Animal Kingdom, I had no idea about how many activities they offered! I actually just got off the phone with Disney. Now I'm just deciding if I want to do club level or not. It would be a no brainer if I was doing a savanna view anyway, especially since we would just order room service for a continental breakfast- so price would be even. But I'm comparing standard view vs club- with a view of the savanna.
Realistically, if I did OKW and rented a boat as well as visiting Disney Springs, or even kept the Swan and did activities in the boardwalk area- it would probably be about the same money spent. That's what I'm trying to convince myself of anyway lol I don't want to regret not getting the view.