Great hardship this, but looks like we'll be returning to WDW in early June for 10 days. We've stayed in Port Orleans Riverside and Caribbean Beach before, but are this time looking at somewhere a bit different, and CSR may fit that bill.
Looking at Google Earth, the Cabanas Village looks...