Mine is going in next week for the replacement. They would not entertain swapping to the painted top. I would definately pay the difference for a painted top. They will not do it. Hopefully the next one is better.
I was in the same position, ended up in a new 24. The 25's were about 7k more. I think the 24s will get cheaper the longer you wait. 23.5k off the sticker. Or 13.5k off the new adjusted price. It was the right color and had the options I wanted. It was priced in line with the used 24's. Good luck!