I am back to using EA in my new job

Starting creating some profiles (stereotyped packages and classes) in 14.1 (last build) and switched to 15...
Problem (tested in 14.1 and 15) is when I extend my stereotype "package" to the package metaclass, and my stereotype "class" to the class metaclass; export/import I get:
- Class Icon represented as Package, but when dragged onto diagram - it IS a stereotyped Class (ok, can live with that... I guess)
- Package Icon represented as Package, but when dragged onto diagram - it IS a stereotyped Class (umm, can't live with that....)
Anyone else experiencing this... Any workarounds... I can live without some of the tagged values on the packages, and such if I have to... and just define the Stereotypes manually...
BTW: Was going to stay in 14 as an add-in I am trying out (OntoUML) works in 14.1 but not in 15. But is it worth jumping into 15 at this time? Might not be a bad time for me (or my client as this will be totally new to them...)
Thanks as always... (this seems to be a common issue with releases if memory serves me...)
David "Back in the EA space" Rains