hahaha...I feel you,I was also looking forward to the switch and hoping that they made it less obvious than in the VN.
I followed closely with Haruka's behaviors in this ep thinking there might a hidden switch at some point but boooooom! the switch come and they didn't even bother to hide it
High expectation lead to high disappointment.