Did ocelot let the liquid persona control him completely or he could return to his own persona in any time?

Yes. At the end of MGS 2 Ocelot was completely absorbed by Liquid's personality that he himself created. Ocelot returned to his "Revolver" mind only after Liquid's and Solid's battle.