2002 RR Won't Shift out of Park

Owned since 2002, bought used with 9k miles. has 250k.
Had a lot of work performed to mechanically restore the vehicle, including dash removed to replace heater core and repair antifreeze O-ring leak, but also engine replaced, suspension 1" lift, hubs, fuse and relay panel, exhaust manifolds, radiator, etc.


Since getting car back I have had a problem with the car getting stuck in park. The car will shift into drive every morning, but if I put in park, it will not shift into drive again unless it has been left to sit for at least 30 minutes and sometimes longer (over night)


Brake switch, bulbs, fuses, etc. have been replaced.


At the time that it will not shift into drive, I hear a clicking in the area of the ignition switch when I pull on shift lever.


Garage that I use, specializes in LR, Jag, Audi and BMW and is suggesting that the solenoid lock in the shifter is bad.


I believe that it is electrical. Not sure if the solenoid lock is a fail open or fail closed configuration, but I believe that the vehicle running is either building or draining a capacitor like charge.


Any insights would be helpful