This has been a long time coming! So I personally took a pretty drastic step and finally retired Narkhi, my faithful lab pet of approximately 14 years (!)
He has a fancy new paint job and enough levels to do okay in any upcoming plot:
And I've adopted a pound pet to zap for colours.