I would avoid the #24 until its confirmed or not if it is in fact a #20 style switch (poor design) with the added ring thingie. However, it may be completely different but better to wait and see.
Also, unless you find a kit, most all will require your own batteries / charger.
Does he want a...