I'd look into the loach family for the borneo hillstream sucker, or chinese butterfly (same fish, different common names). Very neat looking buggers, and they love the fast moving water, along with the higher oxygen levels associated with fast water. If you keep the temp a little low (<75), you could keep a happy colony of these guys. Add a small school of danios, and call it good.