chapterhead style tableofcontents fails

Hi,

I'm writing a thesis and made my own chapterhead style by modifying
\@@makechapterhead, \@@makeschapterhead and \chapterformat (see below) with KOMA-Script "scrbook" documentclass v2.9r .

% ------------------------------------------------------------------------------
\setlength{\lineskiplimit}{0pt}
\linespread{1.10} % I know I should use setspace but... well,
\makeatletter
\renewcommand*{\@@makechapterhead}[1]{\chapterheadstartvskip%
  %\vspace*{-.19\baselineskip} % dirty hack for alignment
  {\normalfont\sectfont\size@chapter
    \setlength{\parindent}{\z@}\setlength{\parfillskip}{\fill}%
      \if@chapterprefix\let\@tempa\raggedsection\else\let\@tempa\@hangfrom\fi%
      \@tempa{\ifnum \c@secnumdepth >\m@ne%
        \chapterformat\fi}%
      \if@chapterprefix\par\nobreak\vskip.5\baselineskip\fi%
      {\hfill\raggedleft \interlinepenalty \@M
\MakeUppercase{#1}\par}}%
    \nobreak\chapterheadendvskip%
    }
\renewcommand*{\@@makeschapterhead}[1]{\chapterheadstartvskip%
  {\parindent \z@ \setlength{\parfillskip}{\fill}\raggedleft
    \normalfont
    \sectfont\size@chapter \MakeUppercase{#1}\par
    \nobreak\chapterheadendvskip
  }}
\makeatother
\renewcommand*{\chapterformat}{%
 {\MakeUppercase{\Large\chapappifchapterprefix{\ }}
 {\fontsize{60}{72}\selectfont\thechapter\autodot}\enskip}}
% ------------------------------------------------------------------------------

I have 2 problems:

1. The \tableofcontents fails:
   

   ! Missing control sequence inserted.
    
                   \inaccessible 
   l.6 \tableofcontents
   

   I assume it is using \addchap and that my modifications brake something but I don't see how to resolve this. When trying this preamble with an empty document, the error is different (uh ?) and says that TeX stack exceeded... so it seems there is an infinite loop induced by my redefinitions.

2. I would prefer if the titles made by \chapter ans those made by \addchap could be equally distant from the top of the sheet (\addchap titles should go down a bit). I tried a dirty \vspace but I don't find it a good generic solution since I'm also modifying interline spacing. Note that the misalignment is due to my huge \chapterformat , but I presume I can't simply fake a huge box in front of \addchap titles since it could break commands relying on it (as for \tableofcontents).

Thanks for your time!
--
Julien Thewys

[Admin-Edit:]

1. <latex></latex> tags added several times (see textformat information)
2. Moved to “Anfänger braucht Hilfe”