Okay, so just to close this one out, this short ended up being the rear license plate lamp. When I reinstalled it I switched the wires. So simple and obvious, and yet so dumb.
Thanks to all for your help!
"The most unreliable car in the world is the most reliable car in the world." -Jeremy Clarkson refering to the Range Rover