Both OVA’s are set early & more comedy based episodes, defintly worth watching.
Theres 1 short set after the final Episode (Angel Beats “Another Epilogue”) which might ruin it for you, but follows the main story & theme.