I was exactly the same as you. Strong proponent of UBI and now I think there must be better solutions out there.