Since you're a federal employee (based on your mention of the TSP) I would actually suggest you worry less about your emergency fund than most folks. One of the perks of federal service is that you get good insurance and relatively high job security. At the very least, you're very unlikely to find yourself suddenly unemployed next month. If you're term or military near discharge, that changes things.
With that in mind, I think feds with secure jobs are better served by considering their job security as part of their EF, and so devoting a smaller portion of their portfolio to cash stores. I can make an exception for folks like you who are buying a house soon.
In a similar vein, once you have decided on your risk tolerance, I recommend you move up one bracket on the TSP's Lifecycle funds, if you're using them. The asset allocations the TSP uses are based on the (mostly) standardized distributions used by the mutual fund market, which are not designed for people with defined-benefit pensions. If you have a pension coming, it basically replaces a portion of your bond (fixed income) allocation. As a result, you should be a little heavy on stocks in your TSP compared to non-federal workers with the same time horizon, and the TSP board doesn't account for that in their asset allocation percentages. This is a matter of personal preference, of course, so don't risk up just because some internet stranger said so.