A friend at the office suggested rumble strips on the yellow line - might warn motorists when they stray, but of course it affects bicycles too.
Rick, you were a rock out there last night - did you catch the name of the lady doctor and the surfer dude that helped? They also deserve a lot of thanks for their efforts.