I love this question - and I love hearing that you're working out with a friend! The answer to your question depends on what type of results you are looking for. If you are looking for more muscle mass, then I would say yes - stick to the straight sets. You could still alternate, just not after each exercise. The rest period after the working set is what you're wanting to be sure to include if you're looking to add size and/or strength. If fat loss is your main objective, then supersetting them like you have been is just fine. Hope that helps!