If Gateway Inn is big enough to accommodate about 20-25 riders, might be a good option next time. Not as much on-site offerings as Fontana, but the only other place I know of with that many amenities in the area is probably IronHorse Inn down 28 in lower Stecoah?
Our Willow cabin wasn't the greatest either, and had it's own issues but was basically just a place to sleep, shit, shower, and have cold storage for our food....that being said, most any larger resort type places would work for us all.