Let $N$ be the number of distinct pairs of socks, let random variable $X_k$ be the number of socks drawn to get the first pair when $k$ socks are in your lap, and let $E_k=\mathbb{E}(X_k)$. We want to compute $E_0$. We derive a recursion by conditioning on the next sock drawn when you have $k$ in your lap. With probability $\frac{k}{2N-k}$, the next sock is a match and you are done. With probability $1-\frac{k}{2N-k}=\frac{2N-2k}{2N-k}$, the next sock is not a match and you have $k+1$ socks in your lap. Hence we obtain recursion
$$E_k =
\begin{cases}
0 &\text{if $k > N$}, \\
1 + \frac{k}{2N-k} \cdot 0 + \frac{2N-2k}{2N-k} E_{k+1} &\text{otherwise}.
\end{cases}
$$
For $N=10$, the values are approximately:
\begin{matrix}
k & E_k \\
\hline
0 & \color{red}{5.6754638550} \\
1 & 4.6754638550 \\
2 & 3.8796562914 \\
3 & 3.2396133278 \\
4 & 2.7195304695 \\
5 & 2.2927072927 \\
6 & 1.9390609391 \\
7 & 1.6433566434 \\
8 & 1.3939393939 \\
9 & 1.1818181818 \\
10 & 1 \\
\ge 11 & 0
\end{matrix}
For the bonus question, let random variable $Y_{k,b,m}$ be the maximum number of socks in your lap to get all pairs when $k$ socks are in your lap, $b$ are in the basket, and the current maximum is $m$, and let $E_{k,b,m}=\mathbb{E}(Y_{k,b,m})$. We want to compute $E_{0,2N,0}$. We derive a recursion by conditioning on the next sock drawn when you are in state $(k,b,m)$. With probability $\frac{k}{b}$, the next sock is a match and you move to state $(k-1,b-1,m)$. With probability $1-\frac{k}{b}$, the next sock is not a match and you move to state $(k+1,b-1,\max(m,k+1))$. Hence we obtain recursion
$$E_{k,b,m} =
\begin{cases}
m &\text{if $b=0$}, \\
\frac{k}{b} E_{k-1,b-1,m} + \left(1-\frac{k}{b}\right) E_{k+1,b-1,\max(m,k+1)} &\text{otherwise}.
\end{cases}
$$
For various $N$, the values are approximately:
\begin{matrix}
N & E_{0,2N,0} \\
\hline
5 & 3.5735449735 \\
10 & \color{red}{6.4892979634} \\
20 & 12.026472105 \\
100 & 53.914792025 \\
\end{matrix}