Baumgartner is now engaged to his former friend Josh Connor, less than two years after splitting from the Hollywood icon - pictured April 2024