3rd Gen UCA's on 2007 DCSB Off-Road

I have a 2007 DCSB Off-Road with approximately 285,000 miles and the front upper ball joints are worn out. The truck has Bilstein 5100's (set at zero) with Old Man Emu 887 coils in the front. The rear has the TSB leafs with a 1.5 AAL. The front UCA's are original and I know that many on this forum have installed aftermarket UCA's which helps with the alignment. I can buy the newer, stock UCA's all day long since many people remove them for aftermarket lifts but I was told that the p/n's for my 2007 only apply from 9/04 to 5/08. I thought for sure all 2nd gen UCA's would be interchangeable but the dealer says otherwise. The p/n's (48610-04020 R/H; 48630-04020 L/H) for my 2007 are about $275 each through the dealer. Has anybody installed UCA's from a newer Tacoma on an older 2nd Gen? I'd appreciate any help I can get, thanks.