ah thanks.
Yes you should do that :)
Maybe half the bonus for each lower tier of machine instead of completly removing it? (25% of your research for t1, 50% for t2)
Also having a blast here, too (as i did with the nauvis rural/lightning setting - the lightning lag i mentioned "killed" it for me for now)
But, yes you are right. This is nauvis rural cranked up to 100.