I agree with everything you said.

My original comment was in response to a comment that claimed that UBI does not suffer from the same incentives as needs-based programs and doesn't punish people for increasing their income.

My point was that this is not true. As your income increases, your relative tax burden from UBI also increases. In other words, as your income increases, "UBI income minus UBI taxes" decreases. Thus creating some of the same incentives as needs based programs. This is common to all progressive tax systems (which I support), and UBI isn't a magical exception.