In regards to thrill rides...
First of all, there's going to be two rides in Avatar Land: the unnamed boat ride you mentioned and a simulator thrill ride (Flight of Passage). So, that takes AK's thrill ride total to 4 or 5, depending on if you consider Kali a thrill ride or not.
Slinky Dog...