Kansas,
OKW does have a store in the HH, next to Olivia's Rest. It does have some F&B, but it's not a full-blown grocery store. If I recall, you can get milk, eggs, some frozen foods, bread, cakes. Stuff like that.
And yes, you are correct about the spaciousness of the 2-bedroom units. We stayed in a 2-bedroom last year and we were surprised how big the condo was. We are staying at BWV's in 2 weeks, for the first time. So, I can't give you a comparison of the two just yet.