Actually, it's interesting that you paired the two, because I think you've picked out the two parts of the long form of the census that are not necessary.
I'll declare my bias; in 23 years as a finance official, my approach to any policy issue is exactly the same: what is the problem? If the problem is the threat of jail time, remove it. You don't need it. It's not used. If the problem—and this was the majority of complaints to the 2006 survey—is the survey of household activity, do you need that? In my view, you do not need that in the long form of the census. You should reserve the census questions to questions that are difficult to ask through other means. You can actually get at household activity through a much smaller survey.
So I would say that if those are the two concerns, you can take those and address both of them, and keep in place the rest.