Jeff, that last paragraph sounds like good advice to me. I wish all Driver's Ed classes taught that, and that all cyclists knew it. I maintain with AASHTO that the pre-intersection merge is implied and encouraged by either the bike lane stopping some distance before the intersection, or at least becoming dashed. Some kind of "Right turn merge with bikes" sign also helps.
Ed - what do you think, and do you have any inclination to take this up with your public works department? (This is the advocacy forum, after all, so I had to ask...
)