Ran into Michelle of All In One Polish last night after the Bradenton regatta. The polish is water based and looks like a very fine aluminum oxide suspension plus a reducing agent and a mild wax-like additive. She does an impressive demo. Had some some pretty rough looking aluminum in several different forms and with < 20 seconds and a rag she was able to put quite a shine on it.
All In One Polish