Yes, uBlock should incorporate Firefox, rather than Firefox incorporating adblocking.