I think the fix is good enough. Take generic r2 and get an extra hull and a (temporarily) better dial for only one point.
Gives it same cost as blue being. I think 6 hit points with 2 agility has to be at least as good as 8 hit points with one agility.