From what you’re saying, Pizza, Springpad is the perfect app for you. OneNote is pretty much Microsoft exclusive, in my experience — but I abandoned it a long time ago.
I think the question here is, what about the new Springpad is bugging you? If it’s problems with the extension, switch to the clipper bookmarklet. It actually works better, at the moment, and offers more control.