Will.
No contest. Plenty of nuanced on screen stuff, despite protests to the contrary, and Imzadi (the novel) is so close to canon that they based a chunk of the series finale on it. (its future segment is practically a prequel.)
Also....though he likes candles, worf wouldn't have put up with Deanna smoking. Riker would feel it adds ambience to his jazz.
One of the things that makes the relationship so real is the way that for a long time everyone but them already knows what they are to each other. Even Data probably figured it out before he has the emotion chip. Its a blessed relief when they finally settle down, but a damn shame that producer meddling meant nemesis never had its second part.