Tough to say, but, in retrospect, I think so. And I'll admit that I considered Al one of the bigger threats to Khabib and never would've given the shot to OAM over him.
I don't want to start blowing smoke now that he got a KO. I know what OAM is; he's a grappler and a rnc specialist, which may (should) play into Khabib''s strengths. But OAM just seems like the sharper fighter at the moment, compared to Al. He's active, athletic, and always improving.