Ok, so I'll be the dissenting opinion on this one, which is pretty low-risk, since you already changed the reservations. :)
I have stayed at AoA and been to CSR. I would choose AoA over CSR 100 times out of 100, construction or not. I find CSR to be way too large and spread out for any stays...