Yes, after many years thinking about it and doing activism for electoral reform, that is the same place I reached. Keep the system as is, but top up to PR with closest losers (possibly with some regional rotation element in Canada to avoid some Provinces consistently getting more representation.