If your wheels need servicing anyway then obviously go ahead with that.
But otherwise can you make the click by riding on a trainer? Then have a second person listen and try to find the location?
Also, you said the 'crankset' was checked/lubed/tightened, but I didn't see you specifically say the bottom bracket. Was that included?
Fwiw, I've had clicks from the zipper pull, twisted wheel magnet and a broken rubber rear light strap hitting spokes all initially have me looking for a more in depth mechanical problem because they all sounded or felt like they were coming from somewhere else.