Mrsjohnson totally get the having a go at your oh thing, I get irrationally mad at mine when he sleeps for ages, and I know I shouldn't but I think hormones and tiredness are to blame. It sounds like you're doing really well with bf though.
Immy isn't a fan of her Moses basket either, it has thrown me a bit as didn't have it with dd1. Warming it with a hot water bottle helps a bit I find.
Is anyone else's baby really noisy/grunty from about 4am? Immy seems to crank up the volume and wriggling every night from this time?!