Both of your solutions are solid.
You can even push the Starsan water through your beer lines to clean them. One thing I would add, is to spray some starsan water around all of your connections, as well as your keg lid. If you get bubbles, you've to a leak.