As I was clearing up the description, a potential third option (Redesigned java class) dawned on me. So I am going to investigate it further as it looks very promising.