I understand what you are hinting at, the Node will trig the logic to get the whole block. What we will do is simply to disable the request for whole blocks.
Also when a whole block is pushed from a peer, we ignore it.
Also when any transaction is pushed from a peer, we ignore that too.
Are those in total the three points needed to degrade to SPV?