Because Hammond B3 organ simulation was important to me for the type of material my band plays I did end up buying http://shop.motifator.com/index.php/voice-libraries/motif-voice-libraries/b-s-knees-voice-bank.html which provided some nice organ patches that were a big improvement on those that come with the Motif 6.

I especially like the patches that provide Leslie emulation control on the mod wheel.