Simple fix for NIN, make trick give 5% as normal but buff your own damage by 20%. So you get 20% additional damage + the 5% extra you are doing to the target with the trick buff.

PROBLEM SOLVED. Pay me.