I tried really hard to find a solution that was worth while, but in the end I gave up.  I concluded that it was better to just build two separate OCFD's:

• One for the Classic OCFD Bands:  80/40/20/17/12/10m
• One for 30/15m

 . . . or to just build an 807-HD, which is almost as good on all bands.