318 or 360? That is my question...

Hey guys,
Here's a quick rundown... I have a 1974 Dart Custom (Daily Driver because I love it!) with a 318. I've had bearings go twice because of oil pump issues. Now I'm getting some nasty lifter chatter and power loss (already tried STP). I'm skeptical on pulling, fixing and reinstalling the same 318 a 3rd time, however, this is where I'd like some input. I had a local garage do the bearings last time and it hasn't run smooth since..

Do I tear apart the same motor and replace the lifters/heads (I've never done this in a Mopar) or do a swap? (Either another 318 or a 360).

Recap:

1. Bearings done twice
2. Oil Pump replaced
3. Really bad lifter chatter
4. Do I Repair or swap?
a. If I find a 360 out of a car first, is it an easy swap?

Any input would help... thanks guys!