Don't forget Lola and Cindry! Lola has to be Nami's opponent; she'll probably find out that Nami is not actually a man or whatever she told her and attack her again.

Either Nami or Robin will fight Perona, this series usually has the females facing off. Zoro has to fight Zombie Brooke in order to get his sword. Sanji vs Absalom, Chopper vs Hogback and Luffy vs Moria all seem pretty obvious - what about Franky and Usopp, who will they fight?

Also, I don't really see Moria as much of a fighter, unless he has heaps of hidden moves we haven't seen yet. The shadow thing seems pretty good in theory but the people you steal them from can still fight so it's not that great, apart from that he's just a big fat guy. Maybe he and Oz will battle together in one big brains/brawn combination type of thing.