Valve lapping compound works well, although I realize most people don't have that laying around. For the tank, if you want greater capacity, a 20 gallon barker tank will fit, but would require you to shuffle the pump around, if its where mine was.
If you want the same size, I doubt you could beat scamps price.