I certainly wouldn't mind retooled versions of farmboy luke (with all the trappings) and Bespin Luke (a regular and damaged version). Then I could pretty much call Luke "done."
Though if they wanted to get crazy, they could do Snowspeeder Luke and Hoth Luke. Honestly, the face tech is so awesome I'm a total sucker for it. Plus, the old versions get recycled for customs, so it's not a huge deal.
Han and Leia really need some more face love though. Bespin Han and ANH Leia in particular, but General Leia and ROTJ Han are much needed too.