Ok, congrats, on that part. However, in the end, it still doesn't mean Sasuke hasn't surpassed Madara. Allow me to explain.
1. According to TAKL's translation, Sasuke's rinnegan usage is on par with Hagoromo. At least this much is true (still will want to see viz)
2. Juubi Jin Madara is no different than a double rinnegan Madara who fused the bijus into the juubi, and used the juubi to give himself 6 paths senjutsu. Moon-seal Sasuke is a ninja who's likely to have the full power of the rinnegan, and a degree of 6 paths senjutsu. Current Sasuke is Moon-seal Sasuke, who has a full half and a piece of the other half, boosted by the same power that gave Madara his 6 paths senjutsu, except Sasuke had it to begin with. So, considering Moon-seal Sasuke>Double rinnegan Madara without the juubi, and they're boosted by the same power, Sasuke, by logic, is stronger than Double rinnnegan juubi jin Madara.
It really doesn't blot out Sasuke and Naruto being stronger.