I had a pretty similar issue with mine (though there were night waking problems too - horrendous!). I ended up using Nic Watson from child Sleep Soltuons (www.childsleepsolutions.co.uk). She was a godsend and helped us get everything sorted, can't recommend her highly enough... Good luck x