I am preparing my thesis using the apa6 document class. I'm using the tocloft package to format my Table of Contents and List of Figures. In the TOC, I can't figure out how to add space BELOW section headers that are followed by a subsection (required formatting of my University). I'm trying to make the space the same as observed for sections w/out any subsections.

\documentclass[man,12pt,natbib]{apa6}
\usepackage[doublespacing]{setspace}
\usepackage{tocloft}

\renewcommand{\cftsecfont}{\normalfont}  % Make Section Headers Not bold in TOC
\renewcommand{\cftsecpagefont}{\normalfont} % Make Section Numbers Not bold in TOC
\renewcommand{\cfttoctitlefont}{\hfill\normalfont} % Line 1/2 to center Heading
\renewcommand{\cftaftertoctitle}{\hfill}                       % Line 2/2 to center Heading
\renewcommand{\cftsecdotsep}{1}   % Line of Dots next to Section  {4.5 default}
\renewcommand{\cftsubsecdotsep}{1}  % Line of Dots next to Subsection
\renewcommand{\cftsecleader}{\normalfont\cftdotfill{\cftsecdotsep}} % Makes Dots for Sections not Bold in TOC

\setlength{\cftaftertoctitleskip}{36pt}  % Space after TOC Header
\setlength{\cftbeforesecskip}{10pt} % Space Between Sections
\setlength{\cftbeforesubsecskip}{-8pt} % Gets subsections close together

\makeatletter
\renewcommand{\section}{\@startsection {section}{1}
{\z@}
{\b@level@one@skip}
{\e@level@one@skip}
{\centering\normalfont\normalsize}}
\renewcommand{\subsection}{\@startsection{subsection}{2}
{\z@}
{\b@level@two@skip}
{\e@level@two@skip}
{\centering\normalfont\normalsize\itshape}}
\makeatother

\begin{document}
\tocloftpagestyle{empty}  % No page numbers
\tableofcontents

\subsection{Subsection}
\subsection{Another Subsection}
\section{In TOC, this Section has correct spacing above \& below for required thesis format}