Military press 5x8? It if you just do 2 more reps per set that's the BBB template, in fact I don't see why it wouldn't work with sets of 8 anyway. So to answer your question yes do that instead of what you have been doing, when you do the other lift don't call it FSL though since that's not what its called.
Also like some other have said don't do joker sets all the time, do FSL or jokers on the main lift but not both together. I've been having success with doing FSL with just 1 AMRAP set.