I've been eying one of those Rigol DSO's that people seem to really like. They're not crazy expensive, but get pretty good reviews. I think I'll wind up getting a standalone frequency counter as well, at some point.