Scott, to a large degree I am with you. A lot of upcoming figures are very WTF? (AT-AT Driver as you mentioned Rancor Keeper, ESB Green EE Astromech redo)
While I am happy to see upgrades out side of the not at all needed AT-AT Driver the choices are a bit puzzling. I figured we would have got Ackbar, MF Pilot Nunb, Yakface, Gammoreaon Guard before we got a dirty fat slob with a fetish for an ugly beast. Vintage Nikto and Wooof are high on my wants list but I am sure we will see a few next year. Nevertheless this is truly a great wave with a lot of new figures when compared to the TPM wave. My hope for the next ROTJ wave is:
The Emperor (New head and ne thicker material for cloak)
Royal Guard (Darker red and improved soft goods.
Skiff Master Weequay
Wicket & Logray Resculpts
Leia Ewok dress resculpt