No thank you to per action and per skill gear swaps.

Yes please to more gear options, with their own strengths and weaknesses, to swap around on a per situation basis.