Those 2 cps1 sprite masking bugs are known, but fixing them in the current cps impl. is quite a puzzle.
With the current "ancient" cps1,2 code, its very tricky to work with.
There was works to replace all of it, but I think interest has been lost..
I will try again to fix this mess tonight!
best regards,
- dink