I brought this up in the spoiler forum, but I think we should have Hughes vs. GSP 3 before Hughes vs. Serra. They need a rubber match and Hughes should have to go through GSP before getting the chance to face Serra.
In the meantime, Serra should drop down to LW and beat Sherk for the LW title. Then he can go back up to WW and face the winner of Hughes/GSP 3 (aka GSP

)