Methinks you are fretting too much. Standard stuff will be absolutely fine for your road use. You should notice some improvement because it will be all new (once bedded in) but you only get the benefit from much more expensive pads and discs under extreme conditions so if you aren't going there then save your money. If you aren't impressed with standard then at least you haven't spent so much, rather than spending loads and not noticing much difference. Discs are drilled to improve heat dissipation when very hot, ie on track, etc, so again, if you don't normally have a problem then don't bother. At the end of the day the best thing you can probably do is renew the brake fluid. That can transform the feel of the brakes if it hasn't been done for a while or is getting a bit old & dirty.