Karen
Air is included in both - we do our own - air credits are included in numbers. Our outstanding TA got us prepaid gratuities on O, so that is a wash, a laptop comes with the O suite but internet is not included. My R gold status is huge on that one! We did a west bound canal trip on R mariner a few years back and we have made all of the port stops on this itinerary, so Shore excursions will not be a major factor. I don't believe that O includes any wine.
Having said all that - I really, really don't like signing for anything!! It detracts from the feeling of being a guest. While I'm not overly price sensitive, one has to be practical regarding value. Those are the horns of this dilemma!
Ted