In my personal experience, irrespective of size and reputation, it doesn't mean the advice given is always good advice.
Given the current political climate and the requirement for non-citizens to show proof of status, I'd get a new passport from your home country, request the old one with your visa and endorsement back, and present it with the evidence of a filed I-90 to obtain an ADIT stamp.
You will need your greencard or evidence of the filed I-90 to file for naturalization.
Once you do navigate the citizenship process, you may want to consider obtaining a US passport card in addition to your US passport, just in case anything happens. The passport card will demonstrate you're a US citizen easily and isn't a break the bank type of ID.
Please do the community a favor and fill out your timeline, too. https://www.visajourney.com/timeline/profile.php?id=488067