yeah, I can see how that can be frustrating. The night stuff sounds a lot like what I was dealing with - dd moving/fussing, etc. and I couldn't sleep so I'd try and get her comfortable so she could, and then therefor I could. Could you put her to sleep in a different room - not necessarily a bedroom? Maybe put her in the living room or a room that is just a room away so that she wouldn't be right in your ear, and you wouldn't be quite so aware of all her baby noises. You might be surprised at how little she'll wake and "need" you, and might just self soothe more to sleep.
Once we really started putting dd down to sleep in the same place every time, and moved her to her own room things were so much better. I was letting her sleep in the swing, in the pak-n-play, the cradle, wherever, and she just didn't sleep well in any of those places. As soon as we started doing the bassinet (and eventually the crib) for every sleep in a sleep inducing environment, where I couldn't see her (and hence intervene when she didn't need me) things were SOOO much better. Using the monitor I could hear what I needed to hear, but some of the wiggling and moving around, I couldn't hear, and so we both slept better. That's just our experience, and what worked for us.
Do you have a good wind down routine for sleep times? That helped me get more consistent sleep out of dd as well. Good luck, and keep me posted on how things go!