I wouldn't switch back to a stock radiator if I were you. :nono: For high-heat applications like yours, the stock radiator is insufficient. I really wouldn't risk it.
A performance radiator with aluminium end-tanks would be best.
Bite the bullet and go with a new Fluidyne or C&R radiator.
As far as moving the radiator core forward - you're gonna need to modifiy the stock brackets or fabricate your own.

h: :thinking: Or could you switch to a "pusher" fan setup?
My 2.3¥