Hi Robert:
I think you made a good choice. Both on account of the least exposure to movement and minimal vibration.
We try to reserve 631 if it's available. Deck 6 is close to all the action - less need to use the elevators, convenient to everything.
Another factor to consider about the Navigator is VIBRATION. I may be over sensitive on this subject, but for my $ I wouldn't choose to be in a cabin aft of the grand stairs. In fact, we preferred to dine in the Compass Rose dining room over Portofino Grill because of the vibration factor.
Bill