I think RIG still looks fine here to me. Sometimes a rising tide lifts all boats. I think the OIH looks pretty good here still as well. I don't see that diamond top you are referring to, but I've not really been schooled in them.