If you replace that F12 on kick drum, you're going to find out how much better life can be. I would grab another dynamic for kick and other duties, the Heil PR40 would be one I think you would be wow'd by. I would likely pick it over the RE20 on just about anything, sounds more lively whereas the RE20 has always been a fairly flat sounding dynamic.
On the multi pattern mic, there is a ton of stuff to choose from. I would not necessarily grab a tube mic but maybe that's just me. On the cheap my favorite as many know is the CAD M179, and the patterns are completely variable as well. In higher price ranges there is the sE Electronics Z5600A (actually a tube mic) or Shure KSM44 and a range of others that would likely outperform what you have soundly.
However, none of those dual diaphragm mics (in any price range) do the OMNI thing well...! The off axis response is still pretty lacking above the 10k range.
If you think you'd be doing a fair amount of OMNI stuff, I would consider a multi capsule mic kit which would include a true pressure omni capsule. The Studio Projects C4 kit for example is a pair of excellent mics that offer 2 different patterns (cardioid and omni caps) and 2 different sounds (the omni cap is a tad darker with a huge bottom response, the cardioid a flatter type of response) and a pretty low noise SDC to boot. I find them to be a lot of mic for the money. The Oktava MK-012 is a step up but more costly. You could get a lot done with a pair of either of those, especially with 2 capsules.
You don't have a ribbon, on the cheap the APEX 205 / 210 is hard to beat (and I've used it against $1800 ribbons and preferred its sound at times!) although the CAD Trion7000 is a nice step up. If you have the budget the AEA R84 rules the roost in my experience of one ribbon that does everything at least very well if not excellent, all delivered with a vibe untouched by other ribbon makers.
There are many others out there worth mentioning, but off the top of my head and having used tons of this stuff, these are the likely "can't go wrong" candidates that you will hear the difference with.