I have serious difficulties seeing Celeborn on the Council. For all that he may be accounted one of the Wise, he doesn't really show it when the Fellowship first arrive in Lothlorien.
There's speculation in Parma Endorion that Glorfindel might be a Vanya. "Few among men have spoken with them" in the Silmarillion writings certainly implies that some among men have had the opportunity to speak with them, whether that is AElfwine and similar figures, or men at the War of Wrath, or something entirely different, is another matter. If he is one, then he's almost certainly a candidate for the Council.
As for Cirdan, I personally think his lot was to stay at the Havens. Even at the Council of Elrond he only sent a representative, when it might be reasonably imagined that he would have come himself.