IIRC, you go through US Customs and Border Protection before leaving in the Bahamas, rather than than on arrival in the US.
They are likely to be more switched on about how the VWP works for visits to the Bahamas than CBP officers in the US would be about VWP visitors returning from Canada.