Yep that's the way to do it - saved a whole lot of money and I got the ticket last week. So if anyone of you is unsure - I can only say go for it: do them both and start the flying 1 hour or so before sunrise or sunset then you got the night as well !
Thanks again for those that posted good advice !