You could find a supercharged out of a 2002 if you want more power. Though you'll probably need the ECU out of it also.
I think trying to put the 4.0 out of an 2005+ is going to be a HUGE undertaking. It's a totally different beast and I am sure if you got it to physically to fit, your electrical issues would be too much to bother.
As for the diesel. It might be doable, but I am not sure which engines would fit. If you got one shipped up from Brazil you might be able to get it to work.
If you want to find out what it takes to swap engines in a 2000, talk to Powerguy, he did it last year, but he just put in another 3.3L from a 2004 I think it was.