You've lined up exactly the sources I'd use for something like this and I can take care of this.

It would probably be appropriate to mark this landuse=residential, name=Big Canoe.  Large and complex areas like this are best represented with the multipolygon relation.  