I don't think there's a conflict; I think you have some choices based on what the end product tastes like:
Is the beer sour/funky/complex enough to qualify as a fruited lambic? If so - 17F. If you just used a Flanders blend like Roselare, this probably isn't the case.
If the base beer was a really solid stylistic example of an Oud Bruin, and the raspberries add complexity without masking the base style, go with 16E.
If its a well-balanced beer that doesn't neatly fit into either of the above, go with Fruit Beer.