I would wait about 6 weeks for new PSA - early June...let everything settle a bit. I suspect you pro had a least mild UTI , which would cause some PSA rise...however, you do what your doc advises.

I too have suffered from kidney stones over the yrs...they are no fun and hurt way more than PC ( at least at first)

Good luck !