Arkham knight

I’m trying to do 240% on Arkham knight and I’m most of the way through NG+. I haven’t collected all the riddler trophies in the standard story and I’m most of the way through the riddler stuff in NG+ do I have to go back?