You've had it apart and cleaned it?
Sounds like a restriction, but it could be an air leak, and it could be anywhere from the tank clunk to the passage leading to the HS screw. I'd just go through the whole thing, and keep my fingers crossed that I find it on the first pass.