I think Na'vi is a better ride than Flight of Passage, all things considered.
Not that I dislike FoP (it's fun), but it's mostly just watching a movie play in front of you. Of course there's simulated motion and a few other effects, but the beautiful video itself is like 90% of the experience (at least for me); it's one of the relatively few attractions where I actually feel like I get a similar experience just watching the video at home. NRJ is far from perfect, but it's a great C ticket and it immerses the rider in physical space in a way FoP does not.
The NRJ wait times are far too long, but that's a function of AK not having enough to do. If you told me I could wait 30 minutes to ride NRJ or 90 minutes to ride FoP, I'd pick NRJ every time. If they were both 90 minutes, I wouldn't ride either.
Anyways, my choice would probably be Smuggler's Run as the most recent. It's just not good. Toy Story Land as a whole is pretty terrible, but the rides themselves are okay because I wouldn't consider either of them a major attraction. Frozen Ever After is abysmal, but it's not a major attraction either. Little Mermaid is also a good choice, but not as recent as MF: SR. Ratatouille looks mediocre at best, but I haven't actually been on it yet.