Consider the benefits of upgrading versus staying the same.
I can't make the choice on your behalf, my advice is to only upgrade what requires it.
Capture your money now. Save it and use it when Zen 3 arrives. You can buy chairs and desks later or even take them.
Absolutely, I enjoy your taste! Your style is great.