I think in your shoes, I would try hard to separate the gifted needs for differentiation from the OEs and treat each accordingly. I've seen OEs in many non-gifted children, ranging from "neuro typical" from an IQ standpoint to below 100 (in the case of a nephew, who only wears certain clothing items - long sleeves all year, tight belt over shirts, etc. and needs soothing mechanisms).

In other words, can you figure out how to get him the academic challenge that is right (above grade level at the right amount of stretch) AND help managing the OEs without worrying about whether they are tied to the first E?