I would switch to Grand Floridian. My family had a similar stay to yours this year also the week after Easter and really enjoyed the GF themed pool. We would have missed it if it was closed. That being said, we have another trip planned for the first week of February 2023 at the Contemporary but...