Modern Breakpoints

Thinking from a mobile first perspective with phablets in play and Microsoft Surface, should I stick to the standard breakpoints or go with more of:

@media only screen 
 and(max-width: 414px) 
 and (max-width: 736px)
 and (-webkit-min-device-pixel-ratio: 2) {

}

This is what I am thinking. If I do it like that for hand held devices and just develop fluid, would it be better? Or should I use what was mentioned here:

stackoverflow iPhone media queriews