I guess your avatar means you normally play curling? That means you might want to get the benefit of swimming to strengthen your core muscles. You don't mention what kind of strokes you know, more than freestyle ("front crawl" I suppose) and backstroke ("back crawl" I hope?). Either of those will, when executed properly, strengthen your core by the rotation that the body makes by each stroke.
The answer to your question, though, is yes, do both.
And stop doing "laps". Do 50s and 100s and, as you progress, longer and longer distances. You could try, for example:
- 2x25 back + 1x50 free
- 4x25 back + 1x100 free
- 6x25 back + 1x150 free
- 8x25 back + 1x200 free
or some set akin to that as your fitness level in the pool increases. And if you really get hooked, contact your local swim club's masters (adult swimming) coach, and make your weekly session one together with other enthusiasts.