I agree with the need to vote on them separately, as they are two different issues.
I do, however, also agree with the need for changing the electoral system. It would be nice to get it in effect before the upcoming elections, but we should at least have it for the future.