Yeah, turning it into a pudding layer is the move. I had a chocolate one do that and just filled the dip with whipped cream and berries. It looked messy but everyone loved the extra creamy part.

Try it after a long flight, @harperc79.