Trending @Accenture; Need suggestions on switch

Need some suggestions. I am a Java Dev having 8+ years of experience at CL 10. My current fixed is 16. I know I am a bit on lower side of market standards and hence want to switch. Now I am not sure should I switch now or should I wait for CL 9 promotion which might get me fixed as 18. Because even if I get 40% hike on 16, it would be around 22 only which would still be less than market standards? Should I wait for my fixed to be 18 and then switch? Thanks in advance.