Rebuild/Reswap?

[DataXUnknown]

Here is my dilemma that I've been trying to deal with. When my SOHC blew up about 2 years ago, (keep in mind I was about 16 years old at the time) me and my buddies swapped an SR into my car. Being at 16/17 during the time, it was our first swap it was kind of a go with the flow, learn on the way kinda thing. After it was done it seemed so easy, just takes a little bit of time.

Now, I've learned so much from Zilvia and other 240 guru's (major credit to kyle shikuni of UCLA if any of you know him), that I was thinking if I should rebuild my motor or just redo the swap. There is so many things that we decided to "ghetto rig" and just temporary fix, little things that should be done in the future and such.

Here is a list of things that I would need to do:
-Install power steering (I have everything needed)
-Install new intake (rubber one is ripped and taped where unused holes)
-Install HKS Catch Can (been running without any catch can for awhile)
-Figure out and fix why my car is compression surging (with a working BOV)
-Fix Vacuum Leaks and remove Charcoal Canister
-Redo CAS
-Mount the radiator (Currently held by zipties)
-Mount the battery
-Fix Exhaust Leaks
-Install new turbo (current one barely spools up anymore and was whineing before)

So thats the basics of what I need to do. Thats besides all of the luxury things I'd like to do like prep and paint the engine bay, clean up the wiring, degrease the engine etc. I just wanted to get feedback on if it's worth it to just pull the motor out and redo everything, or even rebuild the motor because it has been beaten a bit. I'm definetly on a budget being just about 19 years of age, so any input would be lovely. Oh and it's my daily driver.