Yes tot both. All happiness is intrinsically valuable, regardless of the source or the person experiencing it.
Does Bentham endorse sadism? - No, the sadist's happiness is instrumentally evil.
So, Bentham thinks we should not punish criminals? - No, because punishing prevents more unhappiness than it causes for the criminals