I think this was a suggestion I or someone else wrote before. I think it fits perfectly for Heavenswyrm.
EDIT: Found it. Yup I wrote it three months back… Zard's opinion on things that need a buff. - #9 by Killerdog
Ironically your ideas are practically identical to what I wrote back then