There are upgrades that you really need: A better head strap, ideally one with an adjustment knob at the back to easily loosen and tighten the headset. Also one with an extra battery that both gives you longer unplugged time but more importantly balances the headset front to back.
And a better headset/face interface. You can get one that is much softer and thicker, which puts less pressure on the face and moves the screens a few extra mm away. They also have vented interfaces, which help cut down on the problem of getting hot face.
And lastly, you know how all the experts advise that when you're working you stop and take a break to look away from your screens every 20 minutes or so? It's more important in VR to heed that advice. All you have to do is slip off the headset (you got the easy to adjust one that just slides right off, right?), take ten seconds to look at something far away our out the window, and then put it back on and keep working.
If you do all that, there are a lot of great products out that that will give you great virtual monitors and keyboards.