Once Vodafone send the new router and give me a static IP I might just buy a separate firewall.

 

That might be better than messing around with ports that according to some are not anymore secure that the standard.