Clutch Upgrade

I currently have the standard Toyota clutch in my car. It has less than 20,000km on it, but it still slips under hard acceleration in 2nd gear. Has anyone tried aftermarket clutches? I'd like to put in something with more grip, but I don't want a clutch so stiff that city driving becomes a nightmare...

Also, has anyone tried the TRD flywheel? I understand that although the weight reduction allows the engine to reach higher rpms faster, the downside is that the idle is rougher.

Thanks,

Michael