The shift register bug is happening exactly in the shift in under cb1 clock control that you are using.
However, what you quote looks like from the WDC65C22 datasheet. Which, as I understand, has the bug fixed. So, to make sure you don't get hurt, you have to use the WDC device.
Regarding the timing. The bit is shifted in at the next phi2 falling edge. I believe the diagram at page 49 of the wdc datasheet clarifies this:
https://eater.net/datasheets/w65c22.pdf (tSR3)
At least that is how I read it.
I am not sure if any complicated logic is needed if the SR CB1 in clock is just slow enough.
Hope that helps
André
Edit: I just read that WDC may not have fixed the bug. Which would be an absolute bummer!
http://wilsonminesco.com/6502primer/IO_ICs.html
_________________
Author of the GeckOS multitasking operating system, the usb65 stack, designer of the Micro-PET and many more 6502 content:
http://6502.org/users/andre/