A motor swap is probably the most expensive option here, and unneccissary for your goals.
Best bang for your buck, IMO, is the PI swap. Gets the PI heads worked over, get aftermarket cams, the PI intake, and Exhaust, And you'll have a very good daily driving car (simplified). From there, I...