The CRS you list is current statute; the bill is going to change the statute. The bill carves out and defines a gun collector show as a C&R show and defines it as not being a gun show and allows non-firearm vendors as indicated by what you posted. However, there is no like carve out for the defined gun shows. It very specifically defines what a gun show vendor is and what is required to be a vendor and there is no carve out or definition for a non-firearm vendor.
I've previously contacted my Senator concerning this and it appears my understanding of the language of the statute is also his understanding.