A couple of thoughts. If you go for an ablation, both issues should be fixed with one procedure. Also want a very experienced ablator (>4000 procedures, in my opinion). Many here make the effort to travel to Austin to see Dr. Andrea Natale, arguably the best in the world. You can PM Shannon, the moderator to have a phone chat about this.
Chronic fitness (high altitude races, topping out over 14,000') was my ticket to afib in 2004 at age 49. While fitness may be good for your heart plumbing (which is debatable when done to excess), it certainly can wreak havoc with the heart's electrical system. After a 2.5 month episode within the first 4 months, I was able to create a program to keep myself mostly in remission. It involved detraining from chronic endurance activity (though I remain very fit), supplementing magnesium to bowel tolerance, 4 g of taurine/day and a couple of grams of potassium supplement per day (in powder as citrate or bicarbonate). I also got the EP to write a script for flecainide to use on-demand to convert myself when I go out of rhythm. I've had to use this on average one time per year for the last 5 years, and it usually converts me in about an hour. I have never had to be ablated.
George