Thx for the trouble. So they're actually not terms which agreed upon (is why I'm still confused)?
Your 'Bara' is more of fictional '筋肉男' (exaggerated muscular men), while it can still mean '薔薇' (aka 'Yaoi'), or just for fictional gay in general?
So when one see those terms used, one still needs to look into the context to know which they are referring to?
And it all boils down to if the targeted audiences are female or gay men?
There was a critique I used to determine: "Love focused" is for the former; "Sex focused" is for the latter.
But (not sure still waiting the TL:DR or hving time to read :P) what you try to do is generalising the use of "Bara" as a theme / type (just like 'bear'), that not necessarily means Erotic / Porn / Sex / NSFW contents?