Yeah, supplementing with M+ gear would help. Also, doing Mythic EN runs when you can is never a bad idea. Getting a good Titanforged piece could very easily give you a BiS option over NH gear, so much of the EN gear that drops for us has incredible crit and other stats. A pair of the Ursoc legs or its trinket, for example, would be incredible if you proc a 900+ version. Same for Ilg shoulders, spider boss helm, etc.