Uhm, I think the 2.2.5 port is not fine after all. It seems name resolution doesn't work. Although you can use the samba network, the machine/share names don't appear in Windows. This is your original problem, Skippy, and I think it's the 2.2.5 port's fault. The same happens if you don't use nmbd at all, so it looks like nmbd is faulty.
I've gone back to 2.0.7 and I got things working again immediately. If nmbd works in 2.2.5, I don't know how to set it up.
(Swat doesn't seem to work either. :-()