replace dial and/or case of a 1990s' 145.022 (861)?

[phd]

I have a preowned 1990s Omega Speedmaster Professional Ref. 145.022 (861). Wore it on and off and never had it serviced since I got it around 2010. I decided it is time for it to get a proper servicing, and sent it to Omega. The diagnosticwatchmaker/technician determined (among other things):

• This watch needs a full maintenance service
• The watch's timekeeping is not within published tolerance
• The superluminova material on the dial is defective
• The case back is marked
• The case is corroded
• Water resistance cannot be guaranteed
• The dial will remain in its current condition 
• The movement shows signs of moisture penetration (light oxidization of parts and/or plates) 
• The dial has oxidised

I'm given the option to replace the dial (so that I can see the lume at night!) and/or case (for water resistance) for a total cost of around US$2,000. I'm ok with the amount? Refresh the watch exterior for $2000 seems fair. But I would have to give up the "feel" of the original watch and wonder whether the beat-up bracelet would look even more pathetic with a new case and dial.
I'm ok with the expired lume (didn't bother me before I sent the watch in) and lack of water resistance (I don't soak it). 

Any suggestions? Change dial or case or both -- any benefits apart from the cosmetic? Or should I keep it as it is?

[TDS]

Kind of a "fun" situation you are in... lots of options. It might be easier for someone to answer with pics of your watch as it is today. In my opinion, without seeing the watch, i would get the movement perfected and running great but leave the cosmetics as they are. You didnt mention if you inherited it or not but if you did inherit it, to me, that would be even more support to leave the cosmetics alone.

[phd]

It's not inherited, so no issue in that aspect. Unfortunately, I didn't take a photo of the watch before sending it in for servicing. I'm inclined to keep the current dial (which actually looks decent in my opinion). But I was told by the service center that there is no guarantee that the hands could be kept, hence there is a chance of me getting back an old dial + new hands, which usually doesn't look good. (But I can always replace the dial (and hands again) in a few years if I can't bear with it.)

About the case - main concern is whether keeping the current case would cause further damage to the movement. Even if I don't dunk the watch in water, should the lack of water resistance be fixed to protect the movement? Humidity is pretty high for most part of the year where I am.

[1William]

I would get it serviced as recommended.