As for the two bonus episodes, they were included in with Season 3 in the same way they aired, with “Boo Normal” ahead of “Once Upon A Time,” although if you personally feel they should go in a different place, thanks to the beauty of binge-watching, you can always watch ’em in whatever order you want.
Now, all three original seasons of Lucifer are available on Netflix along with Season 4.