If you are fit then walk. The main sights are closer together than you’d imagine. So much to see on ones routes that I have never taken public transport once in the city.
One thing that has changed is the security to get into St Peters, so be prepared for that ( it’s like airport security now)...