I read somewhere that the supplier of OMF and JF bracelets is the same. Of course this is not official information. But I would go JF of course. I actually prefer mine on the leather strap.
Yeah, strap all the way =) specially if it's in RG. It would be a quick tell if you handover your 15400 to anyone with a GEN of this model because of the weight =)