[AUDIT Q2] Make channel handshake checks consistent

[RnkSngh]

Fix the "Some checks in channel handshake functions seem to be inconsistent" informational vuln in the Q2 informal systems report