I think the easiest thing to do with riddles which aren't working for you or your group is to simply replace them with another.

Maybe -- (just grabbing from a quick web search) -- for items:

  • Something more useful when it is broken (an egg).
  • Something easy to lift but hard to throw (a feather).
  • A type of room with no walls, doors, or windows (a mushroom).