I think the plan to drop the late afternoon nap is a good one, from what you've written. I'm pretty sure DS dropped his second sleep somewhere around the 12 month mark.