The clunking is still most likely your regulator preparing to go out...
If the window needs adjustment it's bc the reglator is going out.
$125 for the part... not hard to install if youre good with a screw driver and Internet instructions.....
http://www.bombaydigital.com/boxster/projects/window/
It's most likely not the window motor... it supposidly "rarely goes out."