Yes, I agree - keep the buffets!
I went to London this morning, on an
HST▸ from Nailsea. As soon as I got aboard, I scampered along to the buffet car and asked for a bacon roll. The genial customer host, however, persuaded me to try their toasted bacon sandwich instead - same price, but much better, apparently, than a bacon roll out of the microwave.
Well, I was delighted with the result: a piping hot freshly toasted bacon sandwich, produced with a cheerful grin by the travelling chef. He even apologised for keeping me waiting - I wasn't aware I had been waiting!
You couldn't get that from a trolley - so leave the buffets alone!