Some other suggested fixes:
-Remove RF altogether
-Remove all acquired gear and tokens from RF
-Unnerf T4 and T3.5, or give us the option to play the unnerfed version for shard drops (call it HM or something)
-Give Pet Arena a private instance option
Today you get a minimal reward for a minimal amount of effort, if you get the same minimal reward for a lot more effort the juice won’t be worth the squeeze anymore for a lot of players. Doing what you said in addition to having RF cater to those who aren’t into effort would be the way to go in my opinion.