Cal,
You should be able to get a kit for the acrylic. Not sure if you need to drop the water level down below the scratch. For some reason I THINK its safe to use under water.
On the glass, pretty much nothing you can do, if its not drilled you might be able to turn it around and use the other side as the display side. A total pain, but an option.
_Scott