Yep! I am guessing if they do a second season they will repurpose the character of Jigsaw as the next bad guy. He usually is the very first person they do, but if they're thinking long con he'd make more sense as second season bringing it up a notch.
But I am VERY glad they made this version of Curtis awesome. As soon as he was cast I was like fuck fuck fuck fuck fuck. So glad they changed it.