Hi!
Sorry, I do not know anything about your primary problem, but...
emilSverige wrote:
[...]Can I use hbm files for just the affected class, and annotations for the rest?[...]
this is possible. You can mix annotations and mapping files and access classes from one definition to the other (wild speculation: I imagine, that Hibernate annotations just transfers the annotations into the internal format, resulting in the same internal data structure as classes specified in mapping files).
All the best,
René