Client’s choice is #3 without any additional corrections.
Also you can read our case study which describes how the current Non Juan was born.