Cooling help on ABA bl

Hi all,
Thank you in advance for any help you can give me.  Sorry for the long post…..as there is a lot going on.
We were running a MK1 1984 GTI in the 24 hours Lemons…..but we wore the little engine out.
BTW, it has been a blast driving this car on the track!
Soooo….we have replaced the 1.8 with a 2.0 ABA and have a 1992 GTI head to go with it.
We are going to run the Digifant 1, which came with the engine…..we saw it run…..
To the question:  In our racing, we ran very high oil temperatures……over 120 deg. C. and up to 150 deg. C…….way too high.  We did not have a chance to test the sender.
We have added the stock oil cooler to the 2.0 engine which is sandwiched above the oil filter.
Having looked at the stock method of plumbing the cooler, I question if this is the best for our race car.
The stock water path diagram for the oil cooler is a shunt between the return from the engine block and the return from the rear of the cylinder head.  We do not use a heater.
I would like to run all of the water exiting from the rear of the head and run it through the oil cooler and then onto the inlet of the water pump inlet.
What do you think of this plumbing rather than the stock setup.
Thanks for your help in advance.
This is a new car (british, japanese, Italian, air cooled german, etc ) to me after 66 years of dreaming of cars…..and so far it has performed beyond my wildest expectations!  Scott in CA

the stock routing is better, the way it is factory the cooler will get cold water from the radiator (once stat is open) if you route the water from the head it'll only get hot water from the head!

if you dont have a heater loop the side flange pipe back to the metal pipe and leave it at that