Thank you for sharing your experience.
1) Because you entered Canada in a rental car isn't it obvious to the Canadian officers that you are going to return shortly (without receiving your PR card). Would'nt that be an issue ?
2) Why did you not go to a service center close to Niagara falls for...