Hope you enjoy the River Terrace Inn, I've heard good things about this property. Bouchon is a place we have yet to try in Yountville, please report back with your thoughts, I'm sure it will be very good.
My wife and I are long-time condominium owners of rental rooms and suites at Silverado Country Club & Resort (in the non-built up area of Napa -- actually in the County of Napa and not the City of Napa). It is very conveniently located to the Silverado Trail -- a jumping off spot to some of the best wineries and restaurants while at the same time being only 8-10 minutes from downtown. If you do reserve , go to (http://www.silveradoresort.com), and be sure to ask for (i) a "clubside" unit since you will then be very close to everything (pools, golf, tennis, and on-site restauants); and (ii) weekend or package specials. There is a toll-free number on the contact portion of the website.
Our favorite place to stay in Calistoga is the Indian Springs Resort, they have little bungalows that are like small apartments for lodging, a full kitchen, living area with a wood stove, etc. There is an excellent spa here and they do the mud baths. The highlight of the property is their huge, thermal-heated Olympic size pool that resort guests can use until midnight, very relaxing! Try to get over to the Wappo Bar & Bistro for a meal, if the weather is nice, dine outside on their patio under the wisteria vines, cold water is served with cucumbers here that is very refreshing and hydrating, especially if you you have been wine tasting!
I'm new to the Luxury Link Community. I see that a member is looking forward to spending part of her honeymoon in Calistoga. Here's a suggestion for Calistoga'snext-door-neighbor. I recently returned from a stay at St. Helena's Wine Country Inn, www.winecountryinn.com. Innkeeper Jim Smith and his staff will arrange for in-room massages, rose petal turn downs, chocolate truffles from Woodhouse Chocolates, yum, and they even have a car available for local wine tasting. The Vintner's Cottage is wonderful and looks out over the family-owned vineyard.
If anyone is looking for a recommendation in downtown Napa, I'd highly recommend 1801 First, www.1801first.com. Owner Darcy Tunt makes sure that all guests feel like a VIP. While in Napa, check out the relatively new Oxbow Public Market, http://www.oxbowpublicmarket.com/.For fellow chocolate cookie lovers, pick up a Chocolate Rad from Model Bakery (in St. Helena and Napa's Oxbow) and think of me.
I certainly second WhataTrip's suggestion of 1801 First. We purchased a package from LL to 1801 and used it over Valentine's Day. It was one of the most memorable holidays that we have had. From superior wine tastings and tours to exceptional restaurants in Yountville.
1801 certainly caters to all your needs and always with a smile !!