Just take both passports....I've done this before...they won't need to transfer to your new passport. U usually get a day's grace....one day overstay is usually ok...if not u will just have to pay B500...the immigration officer will walk u over to the overstay counter and u pay. No probs...they r used to it