I save old AA batteries, peel back lip around the top rim, the top hat can easily be removed with a putty knife and a tap on the handle. Then you can solder it the way that's bet for you, I use small solder wick braid, solder to the inside cup of the top hat then other to the flat top 18650, the short braid should fold down enough to add a dab of glue.
A couple of the battery vendors sell wrappers and button top washers, for those that want to rewrap cells. I received a bunch of 30Qs that were supposed to be button top, but were flat top instead. I bought some small powerful magnets that were the same diameter as the button tops. Pop one of the magnets on the end of the cell, then placed a self-adhesive washer over it so the magnet stuck through the center hole just like a button top would. Worked great. There was some concern from others when I shared this in another forum, but I tested by wacking the 30Qs against the palm of my had quite violently, with no ovement of the magnet.