It will pass! The shine will wear off and once he had mastered the crawling he will stop trying to do it when asleep!
When feeding to sleep doesn't work for us, I rock, sing, walk, drive etc.
With my boys I had to put them each iin their cots and put an arm in each cot and pat their backs because I couldn't obviously cuddle them both at the same time. They did cry quite often while I was doing that, and whilst it upset me, I knew they were not hungry, hot, cold, it needed a happy change- they just needed sleep... By about 10 or so months they were much easier and couldn't cry for as long... By 18 months I was putting them in their cot, doing the same routine and they would happily sleep without the tears. Just another option to consider.
I have been half-hearted lot trying it with dd, because now she only feeds to sleep about 50% of te time, and the rest expects something different.