I’d definitely beemind them separately.
Keep doing what you’re doing for yoga, that seems to be working.
Have another goal/graph for swimming.
You can dial the swimming road up in the summer when the water is nicer and down in the winter.
You’ll need to be a little mindful of watching the weather reports and when your swimming eep days are going to come up so you don’t need to go swimming when the conditions are undesirable.
By mixing them together you lose the ability to dial each individually, and you might find you never go swimming because you do extra yoga to make up for it.