My use case is pretty similar to yours, I only add that I tend to mix different file toghter, and they are linked throughout my notes