Etsy seller Bricknut has some fun and cool LEGO Star Trek figures, just in case you have a LEGO Enterprise bridge that needs to be manned. You can get Riker,Worf, Geordi LaForge and Captain Picard. They are pretty unique and would look great on any geek shelf.
Do yourself a favor and check out his other LEGO figures while you are there. The seller also has several Marvel and DC characters. Hopefully they will add more, because I would love to see what he can do with Doctor Who characters.