I would say get it to be safe. It's worth paying the extra fee, if you got to the airport and they wouldn't let you on the plane....
I got mine renewed last year and it only took about 3 weeks. You never know though.
I would suggest wearing a shirt that you LIKE for your picture. LOL. I was wearing a shirt for work that says "Express Tax." I didn't think it would show up in the picture... hahaha it did!
__________________
“All his life he tried to be a good person. Many times, however, he failed.
For after all, he was only human. He wasn't a dog.”
― Charles M. Schultz
Warning: The above post may be dripping in sarcasm and full of smartassedness.