Speeding up labs? Am I making a mistake?

I have all of the card slots that i want (next would be 3500 cards), all of the cards and jet to max out my modules.

What i've gotten to do nowadays is speeding along my "miscelinious" labs. I've sped up about 4-5 levels of trade of perk bonus and currently speeding standard perk bonus labs. I've spent about ~3-4000 diamonds.

Am i making a mistake? I'm currently EHP, farming T10 ~6000 waves.

I know this won't help my tourney placements, but my other labs are:

1:regen lvl 58

2: lab speed (lv 80) (this is permad, will not switch)

3: perk bonus

4: wall rengen(lv 17)
5: wall thorns (working on lvl16) (want to max this, know it's inefficient)

My 3rd lab was wall fort, which is decent at lvl 33 or 640%.

I'll soon need to work on maxHP as rengen is loosing it's efficacy.

I guess my question is, should i swap my 3rd lab to wall fort?
HP and WallHP labs are in shambles. FYI