what should i do?

[AEeighty-six]

i bought a AE86 with a 4A-GE 20v "Silvertop".
the car wasn't running properly.
the previous owner said it only needed to be tuned.

well. just got a estimate on how much it will cost to fix.
the shop says around $1500us.

the swap wasn't done properly.
a lot of unnecessary wiring. ghetto rigged.
header leaks. two outside bolts aren't in. wasn't ever modified to fit.
needs air filters. so would want stacks with filters.
and of course. needs to be tuned with the SDS system installed.

now. the what should i do..?

should i spend the money to fix her up?
or
should i swap the motor out for a 4A-GE 16v?

if i went with the 16v, i could enjoy her on the streets.
if i stay with the 20v, i am told if i pulled over and my hood gets popped, she could be impounded. : (

i had bought her to enjoy on the streets and for some weekend fun.