I chose the Mariner:

Better ship configuration for stairs and elevators.
Better location for H cabins.
No lifeboats in way of view from any cabin.
Better set up for Horizon lounge.
By having Stars lounge, able to keep Mariner lounge "open" for a nicer feel.

Now that they are adding DVD players and coffee bar to Mariner, only Voyager advantages are larger cabins and a few more computers.

Edited to add:

I would rather sail with Capt Neil or Capt Knute instead of Capt Dag. Hopefully, when they extract the Mariner from the clutches of the French (I think it should be in next couple of years), they will make Capt Neil Captain of Mariner.