Definitely do the OCVA. I did it in NZ a couple of years ago. I struggled with the other tests but the OCVA was a very straight forward exercise. Send me a message and I can let you know what I was assessed on.
Please also get in touch with CVDPA, fantastic group of people and their work got this OCVA over the line with NZCAA and CASA.