Very nice setup.

I would keep the barrel.