As long as you extend the visa before the expiry date, it is up to you when you should go. You can go even two days before expiry but to be on the safe side go at least a week earlier. Also, you need not go to Gharaffa as usually there is a big rush there. Suggest you go the immigration office located in Bu Hammour.