Sounds like he has an infection, tbh. If the foreskin gets a bit swollen, and the hole is already very small, it will get even smaller.
If he remains in agony, take him back to A+E, they could pass a fine tube up to drain the wee off, then he'd be comfortable enough till the morning. This might give the swelling a chance to settle.