I'd like to moderate Jon's comment a bit. Unless you are using more than one body, you only use one lens at a time so I don't think that's much of an issue.
For me, the step-up ring is the perfect solution. That's because the only filter I use is a CPL and you can't use a lens hood anyway (well you can, but it ain't easy).

