Priya,
Believe it or not, the "next date with Bureaucracy" is not going to be as painful as the first one. Although, I didnt have my name changed or anything during naturalization process, still, I found the process of obtaining OCI to be very painless and transparent.
Good Luck ..