Are you familiar with Pantley's no cry sleep solution? She has lots of advice on this exact problem. It sounds like you've made good progress on the whole, though.