The government's whole schtick against the "military style" rifles is purely based on form, not function. We clearly see that in the airsoft replicas and in the .22s that have black furniture hit the ban list. So I would say it is almost say that "C21" and "battle rifle" are pretty much mutually inclusive insofar as what the government is targeting with these amendments. We can see old surplus guns like the SKS, SVT40, etc. on that hitlist. Marco Mendicino, even when confronted by a reporter who said yeah, but the SKS was a military weapon back in the 1950s...and now now. Mendicino doubled down and said "yeah, it was originally a military rifle". So any semblance of the government somehow giving any pass on a "battle rifle" I would say is probably not a line of thought that should be entertained.
But moreso to the point, to play the game of what the government may or may not ban is playing right into their hands, with the fear mongering, manipulation and setting the narrative.
Just buy what you can afford (or even if you can't - haha) while you still can. No one knows what the future will bring you would not want to be one of those on the sidelines later saying "I wish I would have..." or "I knew I should have..."
I bought firearms two years ago that people told me I was nuts in buying as it would eventually be banned. They may be right, but it's been two wonderful years of taking these to my club and enjoying the freedom to target shoot and continue a long standing proud Canadian tradition. Had I kowtowed to these fears, I would robbed myself of wonderful experiences with fantastic, well crafted and engineered firearms.
Don't let what the government may or may not do, dictate what you actually do.