Similar GP and I tend to agree. I'm having a difficult time due to having a bad time picking up good data disks. As we tend to mod for speed, it makes it very difficult when we get lose out on TM anyway. Like the OP stated there's a lot of time wasting and frustration. When you have to spend a lot of time with ROTE and raids........I feel PvEed out.
Maybe, add an extra data disk choice (4) to each data disk node. Some sort of algorithm to prevent 2 of the exact same disk appearing at the same time. Possibly a 'I don't want to see this data disk again' button.