Home Depot caries a product called "Bar Keepers Friend". It's been on the market for over 100 years and will not scratch stainless steel or glass. You can buy it for about $2 a can in powder form and a bit more in a liquid formulation. It's amazing and will remove rust.
As cheap as it is and as effective as it is there is no point in trying to formulate your own. And All-Clad Metalcrafters the makers of commercial grade stainless steel cookware recommend it for their products. Give it a try. You may also be able to find it at your local grocer. Bed Bath Beyond carries it as well... but at twice the price. Some Walmarts also carry it.