Yeah, will always be a street car. Going to smooth the engine bay also finally. Had a bit of a accident a few weeks back and broke the balancer again and banged up the headers pretty good so fixing that up too.
Don't waste any actual money on stock shortblock. Just go aftermarket and be done with it. I went through what you are doing a bunch with a turbo setup. Finally went aftermarket never looked back. Good luck