If your budget allows, I would definately upgrade to the WL. It is BEAUTIUL!! However, I must warn you, if you go deluxe, it will be very hard to go back to value or moderate!!
One suggestion I have is to rent DVC points. I am doing this for my upcoming March trip and I only paid $37/night more (for my time frame) for a deluxe over a value resort. I could not be happier!! There are villas at WL you could rent, if that is somewhere you really want to stay. It is wonderful. I can't wait to go back there.