It appears you've got the cleaning down pat. Everyone has their own way of cleaning. I avoid shooting any of my guns with any kind of petroleum product remaining in the barrel. I never, ever humor the thought of using bore butter.
Simple glass cleaner works about as good as anything. I clean my guns with warm water when I've been shooting the t7 stuff. I use Hoppes when I clean after doing smokeless or Bh209. I use WD40, "specialist", long term corrosion preventative inside the bores when the last cleaning patch comes out clean. Being a petroleum product, I use an alcohol patch to remove any of the WD 40 product prior to popping the primers to foul the barrel.