I think it's time to give BitSquare a go. Distributed exchange, FLOSS, no single point of failure. Not suitable for fast trading due to transfer of real money on every trade, but totally fine if you just want to buy or sell cryptocurrency.