I don't have a bass with me right now, but I used to play this in a band and it seems that the first way you mentioned is the correct way (from memory). It makes much more rhythmic sense to pop and slap in that order than to double slap, especially in the context of that particular song as it's just so DAMN funky!
Of course, if it sounds good to do it another way, then do it by all means!