Hello Dave:
I know what you mean about the W&W lozenge. I like their stuff, but it is real fragile. I too have gone back to using the kit decals. With some weathering, it looks pretty decent. I have seen the decals, but just haven't seen any that hit my switch. I will see how your Bavarian turns out as seeing the scheme on a completed kit really sells the decal. That being written, I will be following your build.
Best
Mark