“I’ve heard that when Mashiach comes, the b’chorim will do the avodah. However, there is a famous story with the Chofetz Chaim that showed he held that when Mashiach comes, he, as a kohen, will do it. Maybe both will?”
I hope you’re wrong and only the Kohanim will do it. I don’t like to work because I’m fat and lazy!