Yeah maybe test for overlap at offset with the wall tile - so you might need to check in a radius or each direction in a square.
If offset is compared at say X + 1 (or even X+2) then move light to self.X-1
Do this for each direction or use some trigonometry to calculate the radius
That should work, I think!
~Sol