More or less correct well done. If your replacing the system completely I would suggest you go for hard wired as the wiring is all in place. If you need to add additional detection but have no way of wiring to the new locations then go for a hybrid panel so that you still make use of the hard wire. Wireless systems are fantastic very reliable compared to what they used to be, but there is no point in adding battery powered detection if you have cables run already, your just adding another thing that may go wrong, the batteries will always run out at the most inconvenient time.