I'd go with the Swan.
1. If you're getting a double room, CSR will have 2 full size beds while the Swan will have 2 queen beds.
2. CSR means bus rides to everywhere, Swan gets you boat rides or walk to Epcot & MGM, busses to MK & AK.
3. Swan offers more dining selections in the area with the incredibly short walk over to the Boardwalk. CSR on the other hand, does have a food court - that can be a plus.
4. Views from the Swan are very nice.
We've stayed at the ASMo, POR, and the Swan. My kids prefer the Swan and we have never felt as though we were missing anything (i.e. Disney Magic) in the over 25 nights we have spent there.
CSR and any of the Boardwalk area resorts are heavy on the Conventions, so you are likely to run into conventioners at any of them. I understand this may bother some Disney goers, but not us. The way I see it, those conventioners are just counting the minutes til they can shed those suits and hit the parks with us more casually dressed folk. Afterall, they are conventioning at WDW, they know vacationers will be everywhere, why should we vacationers feel uncomfortable around them?
Wherever you decide to stay, I'm sure your trip will be grand. Enjoy!