Smoking Salmon - marinade request

OK - for all those avid smokers out there cough, hack, wheeze.

I have an electric smoker which I absolutely love to use. Beef jerky has
never tasted better. However, I have never been happy with my experiments
with salmon. Most marinade recipes I see on the 'Net are for curing salmon
which I do not want to do.

So...does anyone have a great marinade for salmon? My goal is to marinade
it, and then smoke it to doneness (and then eat it straight away).

Or....should I marinade it, smoke the flavours in, and then cook it in the
oven? Which flavoured wood chips would you recommend? Any and all advice is
greatly appreciated!