Question about upcoming trip..

I am supposed to go to Canada tomorrow for 6 days as a vacation. This has been planned for well over 2 months now.

I spent some time in Canada in 2010. I entered in April and had a 6 month stamp on my passport. A few months into my stay I became interested in immigrating so I filed for an extension of my visitor visa. I received a letter in October stating that my paperwork had some errors and that I had 90 days to refile and send it off. I was moving at the time (my host was moving to a new location) so I filed my paperwork in December -- within the 90 days. I also included a letter stating that I would be moving to a new address.

I never received another letter back stating that I had errors with my paperwork or that I was denied my extension. I also left voluntarily at what I assumed was the end of my 6 month extension. I am still working on my immigration -- but from the U.S -- where I am from.

I was never served a ban, a removal order, and when I left I had no problems at all.

I spoke to a CIC officer and he told me that I should be ok to come back in -- I have my pay stubs, letter of employment, letter of invitation/support from the friend I will be with, and a scan of my return ticket.

Will I face any problems upon re-entry? I am not coming to stay -- I am coming to visit for six days and I can prove it. Any thoughts?