IMO 22/58 is a bit tall. Get a 62T spur gear and it should all be fine. I ran my 1.5D on 22/62 in my conversion and it ran very well, max temp I ever got was 145 and the 1.5D is a hotter motor than the motor you've got.
All I ever wanted was an honest weeks pay for an honest days work.