Will an affidavit will do because I don't want to go through changing the name in my all documents it is. A very long process
Yes, affidavit can work for error in name across different certificate, you can file an affidavit showing that both name belong to same person, you file an affidavit and get it notarized it from your near court, but for long term you should try to solve the root problem