I think you have to go through passport control and then check in again. In which case I would opt for the 4 hours rather than than the 2.5 hours option.
Security is ok now based on my recent experiences, but passport control can still take a while (not US style, but 20-30 minutes at busy times is possible).