Simple suggestion, use a centrifuge and PBS or another suitable buffer.
Just centrifuge the cells, wash the pellet 1-3 times with PBS and then prepare them for you flow cytometry experiment. This should work pretty okay, without too much loss of cells if you work carefully.