Is it safe to get a new passport right now?

I have a valid passport right now except it has an X marker. At the time, I wasn’t passing and I was too afraid to put M and too uncomfortable to put F. So here we are. My license and birth certificate both have M marker. I would like to fix my passport so all my documents will be good. I’m currently afraid to travel. Me and my wife keep putting off vacation because I am too nervous. If I try to get a new passport, is it possible I won’t get my birth certificate back? Or they’ll send my PP back with an F?

Looking for any advice from someone who’s gone through something similar.