I wouldn't be suprised if he isn't.
Sasuke is just looking for someone/something to vent his Uchiha anger on. Even if all Uchiha were ressurected, he would still be a villian
Kishi has been asked many times, if Madara was the final villain, and he said he hadn't decided, though at the time Tobis identity was thought of as being Madara.