I should probably let you know that my car had a major issue that might have been causing this - when the engine was rebuilt, a bunch of alignment pins were sheared off instead of being used to actually align the engine. This caused a major oil leak, but that's all been fixed now, and it certainly seems a lot better when running.
It's only been a day since I got it back, but I'll let you know if this happens again.