Ola, big sympathy. My ds was like this since birth too. Very grumpy, hard work, always had to be on the go, never let me sit still with him.
In many ways it has got better, he's nearly a year old now. He does smile a LOT more than he used to. He also is able to entertain himself for 45 mins at a time as long as I keep smiling and talking to him.
He doesn't whinge as much, however, he is still VERY VERY VERY strong willed. A lot of the time he will cry just because he's not getting his own way, eg we need to lay him down and change his nappy, or get him dressed, sit him in his high chair, go in the car seat etc. However, he has stopped a lot of the whinging, he just seems to throw more sort of tantrums now but I prefer these occassional flare ups to the incessant whinging. He's still a real moaning whinge bag when he's teething but I guess that's normal.
I think a lot of it, sadly is to do with personality. He still looks very serious compared to other babies. He still cries if he sees something I won't let him have. I he seems to be like a tantrumming toddler already! But on the whole it is easier. His sleep has gone from beong 12-13 hours a night to being completely crap though so once that's sorted, we'll all be happier!
I'm sure it'll get easier, I know it's hard though. x