The devs changed the change weapons from Q to TAB in 0.15 for some reason, so the only thing in the way is the remove items from hand and I don't see how they could affect each other.
You probably only have problem because you're still using the same config as before.
And then I would suggest you just go in the setting and change the shortcut for the chainsaw to something you like.