I have a 9 month old with a very similar pattern. I know it's a long way off... but I can see myself in your shoes down the road! I have recently read the No Cry Sleep Solution by Elizabeth Pantley and would highly recommend it. I've only done a few of her suggestions so far, but I have seen some improvement even with just that. She gives suggestions both for co-sleeping and crib sleeping. Good luck.