7216 Handshake issue

I have been experiencing the same handshake issues that many others have with the 7216 DVR.  Does anyone know when an update will be released to resolve this or should I just go and try to get my 7216 replaced with a 6416?