Excellent, thank you everyone for the responses!

I am currently with 2degrees, paying $85/month for gigabit and my contract is due to expire in October.

Not sure what sort of deal I will be able to get with 2degrees this time round but looking at the other thread, it looks like some existing customers have had pretty good luck. Otherwise, considering either Voyager or Stuff Fibre (hence the question about Orcon vs Stuff).

It sounds like 2degrees might still be the best bandwidth-wise/international connect-wise?

CG-NAT is not really an issue for me :)