I've actually been fine with to-do lines in files. Have a metric for the number you have, and don't abuse it, but they are easy to find and literally next to the code they relate to.