According to USICIS, you have to apply for amendment in 90 days from when uscis has implemented this rule(may 21st). So, you need file the amended petition by August 19, 2015 to avoid any issues.
if Company B applies for premium processing and if you are sure that you can get the h-1b filing receipt before August 19,2015, then go with company B