I have to agree with your philosophy. If you're planning on being there for a while, spending the money now will save you a lot of hassle in the future. I'm guessing it will save you money in the long run anyway.
I like the updated wall (rather windows) better! Lot's of natural light compared to the old!