Use ibuffer, kill-this-buffer
Move ibuffer init to init/ibuffer, use ibuffer-vc for buffer grouping