If the problem only started after an upgrade, I'd suspect that something went wrong with the update and you should downgrade or reinstall.
When you swapped devices, did the problem follow the device or the physical location? If it followed the physical location, I suspect a network hardware problem. If it followed the extension #, then I suspect a problem with your software.