Win XP - Winsock - Firewall

Rcently upgraded to WindowsXP Proffessional, on
installing my broadband (ADSL) connection, my firewall
(McAfee) decided it needed to change the winsock settings.

This however stopped me from accessing the net, so i
found a program that "fixes" this problem, seemed to be
working ok, until I realised my firewall no longer runs.
Everytime i try to run it, it times out.

So anyone know how i can fix this problem, so i can have
a working firewall and a working internet connection, not
one or the other.