Without seeing the shape of the room it's hard to make suggestions, but both sound good. Unusual shapes lend themselves well to creating a medieval or sci fi ish atmosphere - some friends of mine lived in a dorm called the Cloister which was more or less shaped like a miniature of some famous cloister, with arch doorways in the halls. They hung a spear over the door and maybe a giant axe on the oddly slanting wall, and it was all the atmosphere we needed for old fashioned D&D.
Get one of those tables that have a checkboard/flip backgammon board top, a lot have other interchangeable boards below that you can take out and insert, hold the pieces and some cards. Stick a computer and a library and some other game storage things, and it should work. Maybe even add computer games.