You sound perfect! Only problem is I am already booked on the Zuiderdam for the 23rd April. Wish we could have figured this out before. Perhaps next time.
I'm not a big smoker and cannot stand the smell as well, so go figure! My home is totally non-smoking. What is the saying..don't piss in your own pool..
Don't worry about getting along with your cruise mate. You won't spend much time in your room anyways.
Have a great cruise and let me know how it went.