I haven't swapped as I have kept my TM31. It has been fortunate as I have had a little trouble with the TM 5. Nothing major.
I think it is a decision that only you can make. I love both of mine.
Can I ask what issues you have had Cookie?
Great to hear of others experiences.
I didn't get the 2nd jug with mine, but would be hoping to get a promo for one for the TM5 this year.
For those of you who did sell your TM31 - can I ask what they sold for? I've had people offer me $800 for mine and I think that's ridiculous! LOL