My US pport expires in a month AND has a mistake on my middle name. Which form should I file?

Should I file form DS-5504 (corrections), DS-82 (renew by mail), or DS-11 (renew in person)? The former is free, but the doentation at the State Department website says nothing about the expiration date on the replacement pport. I'm uming that if I try to get it corrected, it will expire by the time I get the replacement. There seems to be no way to do both a correction and a renewal simultaneously, except possibly via DS-11. I don't have an impending trip abroad, but would like to minimize my time without a passport.