we are in the same waiting boat! alongwith @vivek.89 @Hot2Cold .
For 3, you have the option to apply visa ALONGWITH the surrender application itself! so you can still go ahead and apply if you would like to have it (without the surrender certificate) and not wait for OCI. If I was in your shoes...