I am sure you will get loads of responses saying "ride them both and pick the one you prefer", which doesn't really answer your question but is good advice in my experience. Can you go for a custom paint job on the Madone if you dislike the stock paint that much?

Either way sounds like you are going to have a pretty sweet bike at the end of the day.