My thought was that Commodore was only used in war-time. I heard this while serving in the navy back in 81-85.
Riker has always been a Commander. In the navy it is a gold cluster Commander and silver for Lt. Commander. I'll have a read on the insert as I too haven't made it past the pretty...