I have added the uBlocker lists to the PiHole, from here:
Also, to deal with the white squares in place of ads, I have switched to the beta branch:
Null blocking works the best for me.
I am still using uBlock on my devices, just for extra insurance. On some pages I have it turned off, because it is detected.