Here's the setup part for the code that you need. This will run a lot faster. I left out the same parts you left out since you said they aren't important. Though I am a bit confused because that's where all the timing issues pop up. But if you say you can get it from just this part then I guess that's all you need.
//Display Includes
#include <SPI.h>
#include <Wire.h>
#include <Adafruit_GFX.h>
#include <Adafruit_SSD1331.h>
//LED Includes
#include <Adafruit_NeoPixel.h>
//Display Definitions
// You can use any (4 or) 5 pins
#define sclk 52 //13
#define mosi 51 //11
#define cs 53 //10
#define rst 50 //9
#define dc 48 //8
//Adafruit_SSD1331 display = Adafruit_SSD1331(cs, dc, rst);
Adafruit_SSD1331 display = Adafruit_SSD1331(cs, dc, mosi, sclk, rst);
//#define LOGO16_GLCD_HEIGHT 16
//#define LOGO16_GLCD_WIDTH 16
#define ChangeButtonPin 19
#define FlipFlopButtonPin 18
#define SmokeButton 17