Oh, the Grand hands down! Lovely atmosphere, close walking distance, never leaving the 'bubble'. I haven't stayed in a renovated room but the pics are lovely!
But I agree with a PP who says if there are kids, stay at the DLH. More characters walking around and better pools. But to me the walk is noticeably further at the end of the day.