You spelled my name wrong! :0
Anyway... I'm still considering exactly what the changes should be. my current thoughts is a bit of both. Revert some things (actually not much) and work around it in others.
For example... I add "Crude oil processing" to advanced oil processing research, just drop that down to basic oil processing technology, and account for the moved fuel block recipes, and now everything is already "Fixed". it's just working out the balance.
but that's just one possible approach, I'm looking at the big picture before I change anything.