Tried the second item first. Water flow now by passes the water filter system. With water filters bypassed the smoke smell in the water is still there.
Will try the other suggestions on Saturday: turn off the water heater then check for smoke smell.
I have to remove the water filter housing to re-seat the gasket for a small leak. When the filter housing is off will also check the filter and the filter sump for the smoke smell.
Will post results on Sunday.