Took the truck in for its second free service today.
Asked them to do the headlight upgrade - didn't admit to having heard of any headlight problems.
Thanks to this forum and this thread I showed them a copy of the PIT.
By now I'm thinking that I'm not going to get anything sorted today.
However, somebody knew about it.
When I picked it up it was all sorted - 2 new bulbs (correct part #) and a BCM flash...and no charge!
Thanks guys for all your hard work on this problem.
Well I couldn't resist, so just took it out for a test drive in the dark.
Very noticeable improvement - I LOVE THIS TRUCK!