Star Wars works thematically as well as Avatar IMO (which isn't very well at all). However, IF Star Tours were moved, I would prefer it over Avatar at DAK.
To me, the whole Avatar idea (or whatever) looks like they're forcing creativity. Animal Kingdom needs to be finished more than "plussed." I don't know why they couldn't add a continent type environment/area (Australia or either of the Americas) in the area between Africa and Asia then fully build out Dino-land (so long Chster and Hester) before Uni does Jurassic Park. That would round out the park substantially without forcing a theme other than "Disney's Animal Kingdom" which, for me, is enough. It's a beautiful but incomplete park; just finish it!