Looks like my analysis was 100% accurate
Oil looks good for longs. Quaadruple resistance at r1 though