If you apply for surrender of passport and OCI at the same time, do they both come together?
My timelines seem to clash for travel but given surrender certificate comes early i.e. in 3-4 weeks and OCI takes more time, I might just bite the bullet and apply for visa 2-3 days prior to departure...