The only thing I can really suggest is maybe when you BF him try not to let him fall asleep at the breast......make sure he stays awake (even sleepily) until he's detatched and then put him to bed?

OR, how do you feel about trying a dummy? does he have one?