If you are paying rack rate I would do dvc because of the 2nd bathing space and kitchenette. However if you can get a discount than the regular poly rooms would be 20-35% lower, depending on which you use.
As far as I know the old Tokelau building is going to be the 1 br villas and renamed. I was on a dvc resale site today and they were not yet showing. (the studio and bungalow rooms were listed)
I loved that building as well and since a 1br fills my families needs at times I hope to get to try it someday. It has a nice central location