Hey Paul. Sorry to hear about your lead time issues. I know we had the same thing as a consumer electronics manufacturer.
One thing we did to relieve it on our end (to keep from having to have several board revisions), was to use dual (even triple) footprints, to account for hard to acquire parts. Of course, this is more difficult to do with power parts, if that is what you are having troubles with, due to the large footprints, and copper required to dissipate heat. We were able to actually make some dual TO-220/TO-247 to allow us to use either part, in different cases, for instance, a lower power model, versus a higher power model. We then populated the board with different parts, based on which model it was. This also allowed us to obtain a better price on boards, due to the volume.
Not exactly your case, but just thought I'd mention it. I see you are using PICs as well. They are my favorite uC of choice right now, mainly because I learned how to use them in college. They seem pretty popular, even though Cypress, Reanus (sp?), and others are trying to get a foothold. The Cypress line (PSoC) have some really neat capabilities built into them, that PIC and others just don't have (or require additional components). They even have some nice RF solutions as well.
For me, I don't mind the wait. I'd like to have them ASAP, but want them to be right. I am still actually trying to decide what to get. I've even thought about getting a strobist setup to tie me over, maybe adding a 430EX II to my 580EX II, and getting some Nano tripods, umbrellas, and some Cyber Syncs...not sure what to do. I did get out the 580EX II the other night, to try out the Stroboscopic (sp?) mode, which was cool...of course, I picked up the closest thing to try it out with... I also did not angle the flash enough away from the background, so my background started to turn gray on me, but not bad for a first try.