Ok the headset detection seems to be working correctly now. It should give tutorial instructions and in-game messages appropriate for whether you have an Oculus or a Vive. If, for some reason, you do see the wrong controller type, you can force the correct headset type with those launch options in SteamVR or your normal Steam Library window.
These changes are live now, with a small 1.3mb update.
Thank you for your patience. :)
Graeme