Personally, I'd go with the machete. However, if you're trying to stay away from "weapons" I would try to stick with something that has other "innocent" uses, like the baseball/cricket bat. There have been other good suggestions also (sjambok, hammer, etc.). As RSSZ said, it's tough when you live under a crappy government (what else do you call one that denies their citizens the tools to protect themselves?) but you have to remember that in a situation like this, you are fighting for your life. Concerns about the legal aftermath should be secondary to making sure you're the one that's still in one piece after the dust settles.
If you're not considering a knife due to concerns about having to be too close, that would also rule out the sap. That said, I'm a big fan of both knives and saps/blackjacks. In fact, it's my opinion that a solid strike with a sap/jack will be more "instantly incapacitating" than a cut/thrust to the same target with a knife.
Whatever you choose, make sure to practice with it so you'll be comfortable using it if it ever becomes necessary.