My program worked similarly to paramour's: those who entered with a master's (of which I was not one) only received credit for a select few classes (generally two at most), and in many cases, they had to "make up" the total hours in some way (e.g., if they received credit for intermediate stats, they still had to make the class hours up somehow, such as with advanced stats, SEM, research methods, etc.).
Those who received credit for their theses didn't have to conduct another thesis, and also didn't have to conduct an intermediate project as did paramour, but it was generally assumed that they would participate in some type of novel research project prior to their dissertation in the place of a thesis.
As for a Psy.D.: if you truly have no interest in conducting (which isn't exactly what you said in your post, per se), then you might want to look into licensable master's degrees, as that would save you potential aggravation--even Psy.D. degrees (if they are from a solid program) are going to require you to conduct research. However, if you're ok with research, and just don't want to pursue it as a career path, then a Ph.D./Psy.D. could still represent a good option, depending on what your career goals are. Keep in mind, though, that finding funding with a Psy.D. is tough, and without funding, many programs are prohibitively expensive.