It was Doctor Lawrence Gordon the whole time.
Until you find out that Adam was the mastermind who actually set him up as he wrote the entire story.
Detective David Tapp comes back with Riggs and the end it all properly because they're too old for this stuff.