My ideal would be very similar to yours. When you lay out the requirements like you have it makes me realize that it's less note taking and more "distributed storage and universal access to a resource management solution that can index and categorize variable content"
That's asking a lot from a note taking app, but not from a CMS.
That's asking a lot from a note taking app, but not from a CMS.