Drilled slotted rotors and stainless lines made a HUGE difference on mine....
Then i went up 2 more sizes on tires and I'm back to not being able to stop. Might upgrade to dual piston in the back, and i heard the front calipers on the 04+ are bigger (just need the bracket/caliper)