Thanks all, was checking out Project Farm reviews of cordless shop vacs - the Rigid and Milwaukee came out on top by a pretty good margin, am leaning towards one of those two.
My C3's are still working fine with Lithium Ions, so not looking to replace, but my old 18v B&D leaf blower needs...