Check out this:
viewtopic.php?f=88&t=79401That should help a lot.
Either way, the only sure fire way to get better handling is to swap springs and shocks. The best replacements are actually lifts. I recommend OME. 927 front springs and 731 rear springs will stiffen up the ride a bit and give better than stock. That's with a 2.5" lift as bonus. You can then opt for either Bilstein shocks, Ironman or OME shocks. All are quality, and I personally run Bilstein.
When first installed I will guarantee that the front won't dive under heavy braking. After a few thousand miles the springs break in and the ride softens up a bit, but still much better than stock.
I can't help with where to order. Jeepin' by Al is where most get their stuff, but that's for the states. Not sure what shipping would be like to Canada.