So is the Riddler the main antagonist of the film? If so, this would be a good way to adapt that character.
Going by the trailer, it does look like it.
Trailer is really freaking good
From what I recall, there is a whole host of Batman-related rogues that will appear in this. I think I spotted Catwoman and the Penguin in this so far.
See, this is what I want out of the DC films: totally different tones, styles and approaches to these characters based on directorial vision. What DC and WB presented us with today (from Suicide Squad to Wonder Woman to this) showcases that they are much more comfortable with allowing the directors to put their stamp on the material and give us distinct films that do not just feel like individual episodes of one long and expensive tv show.