2:30hrs is more than enough time even with the security situation. Just dont run the risk of getting yourself "landed" by ensuring that you cabin bag is the right size for the cabin (they may not be as fussy at NCL but I assure you that they will be at the Flight Connections Center in T1/2). Also just check that cabin bag one last time before you leave your house to ensure you havent left that mini toothpaste or whatever!!!! Whatever cabin your in on the longer flight you will have a tootbrush and paste!!!
Enjoy!!!