This is not a fix but a temporary solution, until you (and I, since I have a similar issue) can figure out the answer.

Plug all your lights back in.
Disconnnect your battery for 2 or 3 minutes.
Reconnect your battery.

It should jump the short for a bit.

My lights come on and go off fine, but the shifter console lights go out after about 20 minutes of driving. Then they come back on a little later. I must have loose contacts or something.