That's definitely who we're supposed to think, after Machiya's last line. Whether it's true, I'm not convinced yet, it'd be super lazy writing to make it so obvious so early, but the writing has been all over the place the last two arcs.
What I wanna know is why even draw Machiya on the "who is...