If Hasbro does release an OTC2 line to go along with the DVD release, this is my preference for waves:
ANH (Wave 1)
New Figures:
-SA Tonnika Sister w/ Blaster And Barglass
-SA Chief Bast w/ E-11, Mouse Droid, SG Skirt Tunic, And Datapad
-CZ-3 w/ "Dome" Sandcrawler Droid
Repacks:
-POTJ Han Solo (Death Star Escape)
-CT Princess Leia (New Likeness)
-CT Stormtrooper
-OTC TIE Fighter Crewman
-POTC Myo
ESB (Wave 2)
New Figures:
-SA Willrow Hood w/ Ice Cream Maker
-SA Captain Needa w/ E-11, Comlink, And SG Skirt Tunic
-SA Ugnaught w/ Removable Smock, C-3P0's Head, And Purse
Repacks:
-TSC AT-AT Driver
-SAGA R-3P0
-SAGA Luke (Hoth)
-OTC Cloud Car Pilot
-POTJ Han Solo (Bespin Escape)
ROTJ (Wave 3)
New Figures:
-SA Romba w/ Spear, Ewok Percussion Set, Knife, And Million Dollar Smile
-SA Star Destroyer Crewman w/ E-11, Removable Pilot Headset, And Datapad
-SA Hermi Odle w/ Staff And Double Barreled Blaster Rifle
Repacks:
-TSC Death Star Gunner
-POTJ Teebo
-CT Darth Vader
-TSC Boba Fett
-OTC Lando (Endor General)
VTSC (Wave 2)
-Darth Vader (ESB)
-Jawa (light-up eyes)
-Luke Skywalker Bespin Gear
-Princess Leia Endor General
-Snow Trooper (Hoth Stormtrooper)