I'm at that point (Head job vs New Motor)

Looking forward to a ride once its running, let me know if you need help with the tune.