You will definitely want to do Flight of Passage in AK - you can choose one of the Avatar rides, and that is the one you want - it will also be one of the hardest to get, so you want to try for it first on your list - it will be harder to get if AK is one of your first days. The other is Slinky Dog Dash in Toy Story Land at HS. Same scenario, can pick one TSL ride for 1st Tier FP. The next is the Seven Dwarves Mine Train at MK, which you probably did last time, but is still the ride with longest lines, so try and FP. And at Epcot there is the new Frozen ride, which opened in 2016, so not sure if you had seen it, and you could choose it for your Tier 1 FP. Also new Soarin movie, Soarin around the World started then too, so you may have seen it, but if not could do it at RD a since it is also a Tier 1.
Don't know if you are staying onsite for 60 day window which makes it a little easier. Whatever you don't get you can always do first at RD if you are interested, and of course keep checking to try and grab it as your trip approaches.