when no other solution seems available, fine tuning by hand may be helpful. Lately, I was trying to raise the content of a wrapfigure becasue it was eating the bottom margin. I had something like:
\begin{wrapfigure}{r}{6cm}\centering
\raisebox{20pt}{
\begin{minipage}[t]{5.8cm}
figure content
\caption
\end{minipage}}
\end{wrapfigure}
but it does not work. Would you have a solution? We have to make sure that the wrapfigure environment does not know that something is moved inside. (It makes me think of the \mathclap command from the mathtools package).
Thanks