It looks like you took a lot of the considerations I offered. When I went to WDW last time, I felt like I missed a ton when I skipped out of AK. There isn't a ton there that is for me, but the attractions they do have seem top notch. Dinosaur and Expedition are probably the 2 most unique attractions there along with the Safari. You won't get to see a ton of the park with your time there, but at least you'll not feel like you missed the whole park.
(For my wife she loves rapids so we must do Kali rapids also.)
If you find that you got through expedition and dinosaur amazingly fast I'd definitely check out the safari. It may add another hour to your time though.