RESOLVED: Joomla upgrade to 2.5 with hikashop

Hi I am working on my upgraded site (1.5 to 1.7) with new Hikashop component. My Joomla friends tell me that new Joomla 2.5 will allow for a "one click" upgrade to 2.5 including all components... Is this true even for Hikashop? I would hate to spend all this time getting 1.7 to work and then have to start over again if there is lot of work to go from 1.7 to 2.5. So will it be that simple for me to upgrade from 1.7 site with hikashop to 2.5 site with hikashop as they say "one click", or will it be more work? Would you instead recommend upgrading 1.5 directly to 2.5 regarding hikashop issues?

Thanks
Scott