If you did a leak down test you should have been able to detemine where the leaking air is going which should tell you if it's a valve or rings.....(don't they teach this stuff anymore?) It's really basic, if you take off the oil cap and you hear escaping air from the crankcase you have a ring problem, if you open your airbox and hear it it's an intake valve, if you put your ear close to the exhaust pipe and hear it it's an exhaust valve.