Welcome to Yorkie Talk.
You could try a little conditioner in the bath (just be careful not to get it in your pup's eyes). Then comb immediately after the bath with a sort of wide tooth comb. As it dries, move to a narrower tooth comb, taking care not to catch any whiskers. Last, you could use a tiny dab of topknot gel. Pet Silk is formulated for pets.