Trade 19 Taco OR for 19 4Run OR?

I'll start by saying, eventually the truck will go away at the end of the lease. I'm only 6 months into a 2 year lease, so part of this question is leased related which I don't fully understand yet (1st lease). Point is, the Taco will eventually be traded for a 4Runner for sure & I want to make sure I get the old platform with 4.0 5 speed combo.
1st off, think I took a screwing on my lease deal so part of this question is does it make sense to cut n run now or better to wait the lease out & then make a trade to 4Run.?.
Right now, there's a brand new 19 4Run OR for 4k off which puts it at 36k. I put 4k down on my lease (had to pay taxes here at lease time) & they only want to give me 30k on an almost 35k payoff.
Is there any way this trade makes sense now with the almost never rebated 4Runners?
If I stay in the lease 1 1/2 more years, is that money just tossed to the wind when I could just be paying for the vehicle I'm eventually gonna buy?
I'm one to justify a financial decision so I thought I'd ask some pros when it comes to these vehicles & this specific financial predicament.?.

Thanks in advance!!!

BTW, have an 88 Toyota 4x4 with a perfectly good bed for truck stuff..