Similar for me: Getting close.
Most painful for me right now is not having a 50mm prime (or 55mm or 58mm, whatever) which I really love. I got the Canon 50mm 1.4, but ...
I will probably get myself a Zeiss Milvus 50mm, which should cover me for 50% (AF not essential, but Image Quality is)...