i had problems with my 89 xj upshifting to final gear very quickley and came to find out it was the tps so you might want to check it out....i was exsperiencing the same things you are it was very sluggish
well hey i have an 89 xj 4.0 with an aw4 and when my tranny wouldnt down shift i found it to be the tps so i replaced it and i was wondering what the voltage specs should be coming out of it because i think it is not adjusted right it idles really low when in gear....and the renault efi system...