I know what you mean by "whatever works"! For the first 6 months, DS actually slept in his Aquarium Swing because it was the only place to keep him slightly upright (reflux issues) and cozy. He has always liked tight spaces.
We are currently booked in a 1BR Villa at BCV. I had considered switching to CR because I have always wanted to try a monorail resort, but this thread has pretty well convinced me that we belong in a 1BR at a DVC resort.
We have enjoyed 2 previous trips with DS - both at BCV in a 1BR Villa, and we just loved the extra room to spread out, the kitchen, the washer/dryer (both trips this was a life-saver due to emergency blow-outs

), and the convenience to Epcot.
On our last trip, DH wanted to sleep in so I took DS to the swings built for two on the sandy beach overlooking the lake and the boardwalk resort area. It was wonderful just swinging with DS, admiring the view, and realizing how lucky I was to be at WDW!
So I guess there will be no adventurous changes for us for now. I am thinking that in a year or two, I may just need to bite the bullet and become a DVC member!