Hog, you ever try polishing your finishes? Not sure if it works with the water-based stuff (or any of the two-parts), but it is beautiful on nitrocellulose and oil polyurethane. It is somewhat time consuming, though, but it is an unbeatable appearance.