As for the question of which is a better all-rounder, the answer is both! Just about every Riv ever made - and certainly most of the current models - will happily do all the riding you've described, so I think you'll need to weigh other factors: tire size, color, lugs or fillet joints, higher toptube or lower (I'm into lower), and availability. More @Wikipedia
Hover over any link to get a description of the article. Please note that search keywords are sometimes hidden within the full article and don't appear in the description or title.