I would've prefered Obito over Madara as the Final Villain since he was the one who we had been seeing all this time. All Madara did was come along and take all the credit.
Regardless, I would've prefered for Kishi to have handled him differently once unmasked. I know the actual reason he started all that wasn't because if Rin but her death was what led to a warped mentality. He did that to get rid of the current world responsible for all that misery. Madara helped him see that and Obito helped Nagato see that.
Here's the thing though. Kishi overdid it with the Rin thing. Sure he made sure to let us know that Rin wasn't the sole reason but in the end, he overdid it regardless and it gave that impression.
That's my take on his character. If giving credit where it's due is what you're refering to, i'll refer to the first paragraph. I do give him credit which is why I'd prefer him over Madara. Since Obito was the one doing all this.
Keep in mind that Madara isn't just some powerhungry typical villain. In his eyes, just like Obito, he thought he was the one doing the right thing.