92 Sonoma Electric Window Fix

My driver's side window slowly went out on me, I've been doing without it but it is a pain. It almost doesn't work at all anymore, it will just barely start to move and then quits. If you let it sit a minute it will go another half inch. I'm assuming the motor has gone out, and have purchased another. But reading another thread, I wonder if it is the regulator? How could I tell? The regulator teeth aren't broken or anything.

I took out the old unit, still attached to the regulator assembly. It appears to be riveted to the regulator, and the regulator was riveted to the door. So I have to find low profile nuts/bolts, or someone who can pop-rivet it back on for me. Any suggestions on this?

Step by step here http://www.usedpartscentral.com/tech/page1.htm