Sound like you have everything covered. One thing you might look at is the MCP73871 charger chip. It looks like it has the load sharing function built in, so you wouldn't need the mosfet or the diode. But I've never used one, so don't know how well it works.
Edit: It turns out the MCP73871 only comes in a QFN package. That would be a deal breaker for me.