Overall I would probably say go Contemporary. In terms of view quality, you are trading the best view at the WL for the worst view at the Contemporary, but you are getting bigger rooms (that are also nicer than the WL IMHO) and monorail access at the Contemporary, which makes up the difference. In my mind before free dining comes into play they are about even, except I would say WL, because you chose that resort originally and the Contemporary (despite the better rooms) has a VERY different feel. Free dining, however, tips the scales back in favor of the Contemporary.
If money isn't an issue, I would see about sort of upgraded views were available at the Contemporary (garden/Tower Bay view/ Tower MK view) because if you had one of those, particularly the Tower ones, it would be no contest. I would be surprised if standard view is all they have left becuase usually, since they tore down one of the Contemporary wings, that is one of the hardest room types at the Contemporary to reserve.