I have a similar setup and the same intention as you. I have decided to make a little table on wheels (castors) with the keyboard/mouse tray bit removable so I can sit it on my lap for FPS etc
I have made the tray from 12mm MDF and rounded the edges with a router - might cover it with some vinyl but I'll see how it goes without.