Agreed. More classes as well.
Yes. I'd prefer not to be a Jedi this time around (although that should most certainly be a choice I could make should I want to).
Let's also make them all worth choosing. Let's not have classes that don't excel at combat when 90% of the game is combat.
Also on muh wishlist: A more developed setting, romances that don't interfere with the main story (if I want romance bad enough, damnit I'll find it), and please: enough with the cliched evil villain.