Don't quote me as I don't play on PS3/4 - But I'm fairly certain that the PS3 being made to PS4 license included both base game and Heavensward (As Stormblood has no PS3 variant). As for the patching, yes. You will be patching up to the most recent install, as you are installing the game on the new system.