I love Rigard but I think I would wait for the Tabbard for Khiona. She is great for me at 70 (need 2 tabbards) but will be going to 80 soon.
That’s my 2 cents.
It depend of how many tabard you have. If you have 5 of them, wait and up Khiona. You can also wait for 8 traps. And i would definetely up Rigard.